Changeset 919:0d97efb0782c in roaraudio

Timestamp:

12/06/08 23:28:06 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

wrote working(!) OSS driver

Location:

roard

Files:

• driver.c (modified) (1 diff)
• driver_oss.c (modified) (1 diff)

roard/driver.c

@@ -32 +32 @@
  { "roar", "RoarAudio driver", "localhost, remote.host.dom", driver_roar_open, driver_roar_close, driver_roar_pause, driver_roar_write, driver_roar_read, driver_roar_flush, NULL},
  { "raw",  "RAW PCM driver", "/some/file", driver_raw_open, driver_raw_close, driver_roar_pause, driver_raw_write, driver_raw_read, driver_raw_flush, NULL},
+#if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS)
+ { "oss", "Open Sound System", ROAR_DEFAULT_OSS_DEV, NULL, driver_oss_close, NULL, NULL, NULL, NULL, driver_oss_open},
+#endif
 #ifdef ROAR_HAVE_LIBAO
  { "ao", "libao audio driver", "DRIVER", driver_ao_open, driver_ao_close, driver_ao_pause, driver_ao_write, driver_ao_read, driver_ao_flush, NULL},

roard/driver_oss.c

@@ -26 +26 @@
 #if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS)
 
+#define er() close(fh); return -1
+
 int driver_oss_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info) {
+ int tmp;
+ int fh;
+
+ if ( device == NULL )
+  device = ROAR_DEFAULT_OSS_DEV;
+
+ roar_vio_init_calls(inst);
+
+ if ( (fh = open(device, O_WRONLY, 0644)) == -1 ) {
+  ROAR_ERR("driver_oss_open(*): Can not open OSS device: %s: %s", device, strerror(errno));
+  return -1;
+ }
+
+ roar_vio_set_fh(inst, fh);
+
+ switch (info->channels) {
+  case  1: tmp = 0; break;
+  case  2: tmp = 1; break;
+  default: er();
+ }
+
+ if ( ioctl(fh, SNDCTL_DSP_STEREO, &tmp) == -1 ) {
+  er();
+ }
+
+ switch (info->bits) {
+  case  8: tmp = AFMT_S8; break;
+  case 16:
+    switch (info->codec) {
+     case ROAR_CODEC_PCM_S_LE: tmp = AFMT_S16_LE; break;
+     case ROAR_CODEC_PCM_S_BE: tmp = AFMT_S16_BE; break;
+     default                 : er();
+    }
+   break;
+  default: er();
+ }
+
+ if ( ioctl(fh, SNDCTL_DSP_SAMPLESIZE, &tmp) == -1 ) {
+  er();
+ }
+
+ tmp = info->rate;
+
+ if ( ioctl(fh, SNDCTL_DSP_SPEED, &tmp) == -1 ) {
+  er();
+ }
+
+ if ( tmp < info->rate * 0.98 || tmp > info->rate * 1.02 ) {
+  er();
+ }
+
+ return 0;
 }
 
 int driver_oss_close(DRIVER_USERDATA_T   inst) {
+ return close(roar_vio_get_fh((struct roar_vio_calls *)inst));
 }