Changeset 3684:69134bcda4c2 in roaraudio for roard
- Timestamp:
- 04/14/10 00:23:10 (14 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/Makefile
r3571 r3684 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 7 7 CF_CONTAINER=codecfilter_wave.o codecfilter_raum.o 8 EMUL=emul_esd.o emul_simple.o 8 EMUL=emul_esd.o emul_simple.o emul_rsound.o 9 9 10 10 CF=${CF_CONTAINER} ${CF_CODEC} -
roard/clients.c
r3579 r3684 405 405 #endif 406 406 #endif 407 #ifndef ROAR_WITHOUT_DCOMP_EMUL_ESD 408 case ROAR_PROTO_RSOUND: 409 rv = clients_delete(id); 410 break; 411 #endif 407 412 default: 408 413 rv = -1; -
roard/include/roard.h
r3572 r3684 99 99 #include "emul_esd.h" 100 100 #include "emul_simple.h" 101 #include "emul_rsound.h" 101 102 #include "sources.h" 102 103 #include "sample.h" -
roard/network.c
r3603 r3684 96 96 ROAR_DBG("net_get_new_client(void): fh = %i", fh); 97 97 98 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND 99 if ( lsock->proto == ROAR_PROTO_RSOUND ) { 100 client = emul_rsound_on_connect(fh, lsock); 101 switch (client) { 102 case -1: return -1; break; 103 case -2: return 0; break; 104 default: // TODO: write error handling 105 clients_get(client, &c); 106 fh = c->fh; 107 break; 108 } 109 } else { 110 #endif 111 98 112 client = clients_new(); 99 113 … … 107 121 return -1; 108 122 } 123 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND 124 } 125 #endif 109 126 110 127 if ( clients_get(client, &c) != -1 ) { … … 166 183 break; 167 184 #endif 185 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND 186 case ROAR_PROTO_RSOUND: // nothing to do here. 187 break; 188 #endif 168 189 default: 169 190 // OS independiend code to close the socket: -
roard/roard.c
r3613 r3684 216 216 printf(" simple WM LRX - PulseAudio simple protocol\n"); 217 217 #endif 218 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND 219 printf(" rsound W - RSound emulation\n"); 220 #endif 218 221 } 219 222
Note: See TracChangeset
for help on using the changeset viewer.