Changeset 3669:93a98c7f08f3 in roaraudio

Timestamp:

04/06/10 02:24:16 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for OSS to roarinterconnect :)

Files:

• ChangeLog (modified) (1 diff)
• doc/man1/roarinterconnect.1 (modified) (1 diff)
• roarclients/Makefile (modified) (1 diff)
• roarclients/roarinterconnect.c (modified) (7 diffs)

ChangeLog

@@ -17 +17 @@
         * done a lot work on libroaross
         * fixed segfault in ALSA plugin
+        * Added support for OSS to roarinterconnect(1)
 
 v. 0.3beta4 - Sat Feb 06 2010 26:02 CET

doc/man1/roarinterconnect.1

@@ -64 +64 @@
 
 .TP
+\fBoss\fR
+Open Sound System (OSS) device
+
+.TP
 \fBbidir\fR
 Connect bidirectional

roarclients/Makefile

@@ -53 +53 @@
         $L
 roarinterconnect: roarinterconnect.o
-        $L $(lib_esd)
+        $L $(lib_esd) $(LIBROAREIO)
 roarbidir: roarbidir.o
         $L

roarclients/roarinterconnect.c

@@ -25 +25 @@
 
 #include <roaraudio.h>
+#include <libroareio/libroareio.h>
 
 #ifdef ROAR_HAVE_ESD
@@ -35 +36 @@
 #define MT_ESD      0x20
 #define MT_SIMPLE   0x30
+#define MT_OSS      0x40
 #define MT_DEFAULT  MT_ROAR
 
@@ -64 +66 @@
         "  esd                - EsounD Server\n"
         "  simple             - PulseAudio using simple protocol\n"
+        "  oss                - Open Sound System (OSS) device\n"
         "\n"
         "  bidir              - Connect bidirectional\n"
@@ -93 +96 @@
     ret -= ret & MT_MASK;
     ret += MT_SIMPLE;
+   } else if ( !strcmp(type, "oss") ) {
+    ret -= ret & MT_MASK;
+    ret += MT_OSS;
    } else if ( !strcmp(type, "bidir") ) {
     ret -= ret & ST_MASK;
@@ -122 +128 @@
    case MT_SIMPLE: ret |= ST_TRANSMIT; break; // we use ST_TRANSMIT because ST_BIDIR is
                                               // very unlike to be configured at the server side.
+   case MT_OSS:    ret |= ST_BIDIR;    break;
    default:
      return MT_NONE|ST_NONE; // error case
@@ -134 +141 @@
  struct roar_connection con[1];
  struct roar_stream     stream[1];
+ struct roar_vio_calls  vio;
+ struct roar_audio_info info;
  int    rate     = 44100;
  int    bits     = 16;
@@ -198 +207 @@
     rfh = roar_simple_stream(rate, channels, bits, codec, remote, tmp, "roarinterconnect");
    break;
+  case MT_OSS:
+    switch (type & ST_MASK) {
+     case ST_BIDIR:
+       tmp      = ROAR_DIR_BIDIR;
+      break;
+     case ST_TRANSMIT:
+       tmp      = ROAR_DIR_PLAY;
+       localdir = ROAR_DIR_MONITOR;
+      break;
+     case ST_RECEIVE:
+       tmp      = ROAR_DIR_RECORD;
+       localdir = ROAR_DIR_PLAY;
+      break;
+     default:
+       fprintf(stderr, "Error: unknown stream type\n");
+       return 2;
+    }
+    info.rate     = rate;
+    info.channels = channels;
+    info.bits     = bits;
+    info.codec    = codec;
+    if ( roar_cdriver_oss(&vio, "OSS", remote, &info, tmp) == -1 ) {
+     fprintf(stderr, "Error: can not open OSS device %s\n", remote);
+     return 2;
+    }
+    if ( roar_vio_ctl(&vio, ROAR_VIO_CTL_GET_FH, &rfh) == -1 ) {
+     roar_vio_close(&vio);
+     fprintf(stderr, "Error: can not get filehandle for OSS device %s\n", remote);
+     return 2;
+    }
+   break;
 #ifdef ROAR_HAVE_ESD
   case MT_ESD: