From c050d7254c13c22baafb71c127e56eb1d5f6ffdb Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 23 Jun 2004 23:40:39 +0000
Subject: rename oss.[ch] to oss-util.[ch]

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@34 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/oss-util.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/oss-util.h |  8 ++++++++
 src/oss.c      | 48 ------------------------------------------------
 src/oss.h      |  8 --------
 4 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100644 src/oss-util.c
 create mode 100644 src/oss-util.h
 delete mode 100644 src/oss.c
 delete mode 100644 src/oss.h

(limited to 'src')

diff --git a/src/oss-util.c b/src/oss-util.c
new file mode 100644
index 00000000..02bf8cd1
--- /dev/null
+++ b/src/oss-util.c
@@ -0,0 +1,48 @@
+#include <assert.h>
+#include <sys/soundcard.h>
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+
+#include "oss.h"
+
+int oss_auto_format(int fd, struct pa_sample_spec *ss) {
+    int format, channels, speed;
+
+    assert(fd >= 0 && ss);
+    
+    format = AFMT_S16_NE;
+    if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != AFMT_S16_NE) {
+        int f = AFMT_S16_NE == AFMT_S16_LE ? AFMT_S16_BE : AFMT_S16_LE;
+        format = f;
+        if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != f) {
+            format = AFMT_U8;
+            if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != AFMT_U8) {
+                fprintf(stderr, "SNDCTL_DSP_SETFMT: %s\n", format != AFMT_U8 ? "No supported sample format" : strerror(errno));
+                return -1;
+            } else
+                ss->format = SAMPLE_U8;
+        } else
+            ss->format = f == AFMT_S16_LE ? SAMPLE_S16LE : SAMPLE_S16BE;
+    } else
+        ss->format = SAMPLE_S16NE;
+        
+    channels = 2;
+    if (ioctl(fd, SNDCTL_DSP_CHANNELS, &channels) < 0) {
+        fprintf(stderr, "SNDCTL_DSP_CHANNELS: %s\n", strerror(errno));
+        return -1;
+    }
+    assert(channels);
+    ss->channels = channels;
+
+    speed = 44100;
+    if (ioctl(fd, SNDCTL_DSP_SPEED, &speed) < 0) {
+        fprintf(stderr, "SNDCTL_DSP_SPEED: %s\n", strerror(errno));
+        return -1;
+    }
+    assert(speed);
+    ss->rate = speed;
+
+    return 0;
+}
diff --git a/src/oss-util.h b/src/oss-util.h
new file mode 100644
index 00000000..34ac9c66
--- /dev/null
+++ b/src/oss-util.h
@@ -0,0 +1,8 @@
+#ifndef fooosshfoo
+#define fooosshfoo
+
+#include "sample.h"
+
+int oss_auto_format(int fd, struct pa_sample_spec *ss);
+
+#endif
diff --git a/src/oss.c b/src/oss.c
deleted file mode 100644
index 02bf8cd1..00000000
--- a/src/oss.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <assert.h>
-#include <sys/soundcard.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-#include "oss.h"
-
-int oss_auto_format(int fd, struct pa_sample_spec *ss) {
-    int format, channels, speed;
-
-    assert(fd >= 0 && ss);
-    
-    format = AFMT_S16_NE;
-    if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != AFMT_S16_NE) {
-        int f = AFMT_S16_NE == AFMT_S16_LE ? AFMT_S16_BE : AFMT_S16_LE;
-        format = f;
-        if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != f) {
-            format = AFMT_U8;
-            if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != AFMT_U8) {
-                fprintf(stderr, "SNDCTL_DSP_SETFMT: %s\n", format != AFMT_U8 ? "No supported sample format" : strerror(errno));
-                return -1;
-            } else
-                ss->format = SAMPLE_U8;
-        } else
-            ss->format = f == AFMT_S16_LE ? SAMPLE_S16LE : SAMPLE_S16BE;
-    } else
-        ss->format = SAMPLE_S16NE;
-        
-    channels = 2;
-    if (ioctl(fd, SNDCTL_DSP_CHANNELS, &channels) < 0) {
-        fprintf(stderr, "SNDCTL_DSP_CHANNELS: %s\n", strerror(errno));
-        return -1;
-    }
-    assert(channels);
-    ss->channels = channels;
-
-    speed = 44100;
-    if (ioctl(fd, SNDCTL_DSP_SPEED, &speed) < 0) {
-        fprintf(stderr, "SNDCTL_DSP_SPEED: %s\n", strerror(errno));
-        return -1;
-    }
-    assert(speed);
-    ss->rate = speed;
-
-    return 0;
-}
diff --git a/src/oss.h b/src/oss.h
deleted file mode 100644
index 34ac9c66..00000000
--- a/src/oss.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef fooosshfoo
-#define fooosshfoo
-
-#include "sample.h"
-
-int oss_auto_format(int fd, struct pa_sample_spec *ss);
-
-#endif
-- 
cgit