Changeset 4928:3c94809279ed in roaraudio for roarclients/roarinterconnect.c

Timestamp:

05/08/11 11:40:21 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

updated rsound support

File:

• roarclients/roarinterconnect.c (modified) (10 diffs)

roarclients/roarinterconnect.c

@@ -49 +49 @@
 #define _HAVE_OSS
 #endif
+
+#define CLIENT_NAME "roarinterconnect"
 
 #define MT_NONE     0x00
@@ -174 +176 @@
 enum rsd_format para2rsdfmt (int bits, int codec) {
  switch (codec) {
-/*
-      RSD_S16_LE = 0x0001,
-      RSD_S16_BE = 0x0002,
-      RSD_U16_LE = 0x0004,
-      RSD_U16_BE = 0x0008,
-      RSD_U8     = 0x0010,
-      RSD_S8     = 0x0020,
-      RSD_S16_NE = 0x0040,
-      RSD_U16_NE = 0x0080,
-*/
   case ROAR_CODEC_PCM_S_LE:
     switch (bits) {
@@ -192 +184 @@
      case 16: return RSD_S16_LE; break;
 #endif
+#ifdef RSD_S32_LE
+     case 32: return RSD_S32_LE; break;
+#endif
     }
    break;
@@ -202 +197 @@
      case 16: return RSD_S16_BE; break;
 #endif
+#ifdef RSD_S32_BE
+     case 32: return RSD_S32_BE; break;
+#endif
     }
    break;
@@ -212 +210 @@
      case 16: return RSD_U16_LE; break;
 #endif
+#ifdef RSD_U32_LE
+     case 32: return RSD_U32_LE; break;
+#endif
     }
    break;
@@ -221 +222 @@
 #ifdef RSD_U16_BE
      case 16: return RSD_U16_BE; break;
+#endif
+#ifdef RSD_U32_BE
+     case 32: return RSD_U32_BE; break;
 #endif
     }
@@ -314 +318 @@
        return 2;
     }
-    if ( roar_vio_simple_stream(&vio, rate, channels, bits, codec, remote, tmp, "roarinterconnect") == -1 ) {
+    if ( roar_vio_simple_stream(&vio, rate, channels, bits, codec, remote, tmp, CLIENT_NAME) == -1 ) {
      fprintf(stderr, "Error: can not open RoarAudio stream to %s: %s\n", remote, roar_error2str(roar_error));
      return 2;
@@ -388 +392 @@
     switch (type & ST_MASK) {
      case ST_FILTER:
-       rfh = esd_filter_stream(tmp, rate, remote, "roarinterconnect");
+       rfh = esd_filter_stream(tmp, rate, remote, CLIENT_NAME);
       break;
      case ST_TRANSMIT:
-       rfh = esd_play_stream(tmp, rate, remote, "roarinterconnect");
+       rfh = esd_play_stream(tmp, rate, remote, CLIENT_NAME);
       break;
      case ST_RECEIVE:
-       rfh = esd_monitor_stream(tmp, rate, remote, "roarinterconnect");
+       rfh = esd_monitor_stream(tmp, rate, remote, CLIENT_NAME);
       break;
      default:
@@ -421 +425 @@
        rsd_set_param(rd, RSD_SAMPLERATE, &rate);
        rsd_set_param(rd, RSD_FORMAT,     &fmt);
+#ifdef RSD_IDENTITY
+       rsd_set_param(rd, RSD_IDENTITY,   CLIENT_NAME);
+#endif
        rfh = rsd_exec(rd);
        if ( rfh == -1 ) {
@@ -484 +491 @@
  }
 
- if ( roar_simple_connect(con, server, "roarinterconnect") == -1 ) {
+ if ( roar_simple_connect(con, server, CLIENT_NAME) == -1 ) {
   fprintf(stderr, "Can not connect to local server\n");
   return 20;