Changeset 3684:69134bcda4c2 in roaraudio

Timestamp:

04/14/10 00:23:10 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added most of the rsound interface

Location:

roard

Files:

• Makefile (modified) (1 diff)
• clients.c (modified) (1 diff)
• emul_rsound.c (added)
• include/emul_rsound.h (added)
• include/roard.h (modified) (1 diff)
• network.c (modified) (3 diffs)
• roard.c (modified) (1 diff)

roard/Makefile

@@ -6 +6 @@
 CF_CODEC=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_alaw.o codecfilter_mulaw.o codecfilter_sndfile.o codecfilter_fishsound.o
 CF_CONTAINER=codecfilter_wave.o codecfilter_raum.o
-EMUL=emul_esd.o emul_simple.o
+EMUL=emul_esd.o emul_simple.o emul_rsound.o
 
 CF=${CF_CONTAINER} ${CF_CODEC}

roard/clients.c

@@ -405 +405 @@
 #endif
 #endif
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_ESD
+  case ROAR_PROTO_RSOUND:
+    rv = clients_delete(id);
+   break;
+#endif
   default:
     rv = -1;

roard/include/roard.h

@@ -99 +99 @@
 #include "emul_esd.h"
 #include "emul_simple.h"
+#include "emul_rsound.h"
 #include "sources.h"
 #include "sample.h"

roard/network.c

@@ -96 +96 @@
  ROAR_DBG("net_get_new_client(void): fh = %i", fh);
 
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
+ if ( lsock->proto == ROAR_PROTO_RSOUND ) {
+  client = emul_rsound_on_connect(fh, lsock);
+  switch (client) {
+   case -1: return -1; break;
+   case -2: return  0; break;
+   default: // TODO: write error handling
+     clients_get(client, &c);
+     fh = c->fh;
+    break;
+  }
+ } else {
+#endif
+
  client = clients_new();
 
@@ -107 +121 @@
   return -1;
  }
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
+ }
+#endif
 
  if ( clients_get(client, &c) != -1 ) {
@@ -166 +183 @@
    break;
 #endif
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
+  case ROAR_PROTO_RSOUND: // nothing to do here.
+   break;
+#endif
   default:
     // OS independiend code to close the socket:

roard/roard.c

@@ -216 +216 @@
  printf("  simple        WM LRX - PulseAudio simple protocol\n");
 #endif
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
+ printf("  rsound        W      - RSound emulation\n");
+#endif
 }