Changeset 3266:40be2c179060 in roaraudio

Timestamp:

01/31/10 15:57:14 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support for PulseAudio? Simple protocol

File:

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

roarclients/roarinterconnect.c

@@ -33 +33 @@
 #define MT_ROAR     0x10
 #define MT_ESD      0x20
+#define MT_SIMPLE   0x30
 #define MT_DEFAULT  MT_ROAR
 
@@ -61 +62 @@
  printf("  roar               - RoarAudio Server\n"
         "  esd                - EsounD Server\n"
+        "  simple             - PulseAudio using simple protocol\n"
         "\n"
         "  bidir              - Connect bidirectional\n"
@@ -87 +89 @@
     ret -= ret & MT_MASK;
     ret += MT_ESD;
+   } else if ( !strcmp(type, "simple") ) {
+    ret -= ret & MT_MASK;
+    ret += MT_SIMPLE;
    } else if ( !strcmp(type, "bidir") ) {
     ret -= ret & ST_MASK;
@@ -112 +117 @@
  if ( (ret & ST_MASK) == ST_NONE ) {
   switch (ret & MT_MASK) {
-   case MT_ROAR: ret |= ST_BIDIR;  break;
-   case MT_ESD:  ret |= ST_FILTER; break;
+   case MT_ROAR:   ret |= ST_BIDIR;    break;
+   case MT_ESD:    ret |= ST_FILTER;   break;
+   case MT_SIMPLE: ret |= ST_TRANSMIT; break;
    default:
      return MT_NONE|ST_NONE; // error case
@@ -138 +144 @@
  int    i;
  int    localdir = ROAR_DIR_BIDIR;
+ int    rport;
 
  for (i = 1; i < argc; i++) {
@@ -235 +242 @@
    break;
 #endif
+  case MT_SIMPLE:
+    switch (type & ST_MASK) {
+     case ST_TRANSMIT:
+       tmp = SHUT_RD;
+       localdir = ROAR_DIR_MONITOR;
+      break;
+     case ST_RECEIVE:
+       tmp = SHUT_WR;
+       localdir = ROAR_DIR_PLAY;
+      break;
+     default:
+       fprintf(stderr, "Error: this type is not supported by PulseAudio\n");
+       return 2;
+    }
+    // we guess INET here...
+    if ( strstr(remote, "/") == NULL && (k = strstr(remote, ":")) != NULL ) {
+     *k = 0;
+     k++;
+     rport = atoi(k);
+    } else {
+     rport = 4712;
+    }
+    rfh = roar_socket_connect(remote, rport);
+    ROAR_SHUTDOWN(rfh, tmp);
+   break;
   default:
     fprintf(stderr, "Error: unknown/not supported server type\n");