Changeset 3266:40be2c179060 in roaraudio
- Timestamp:
- 01/31/10 15:57:14 (14 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roarclients/roarinterconnect.c
r3121 r3266 33 33 #define MT_ROAR 0x10 34 34 #define MT_ESD 0x20 35 #define MT_SIMPLE 0x30 35 36 #define MT_DEFAULT MT_ROAR 36 37 … … 61 62 printf(" roar - RoarAudio Server\n" 62 63 " esd - EsounD Server\n" 64 " simple - PulseAudio using simple protocol\n" 63 65 "\n" 64 66 " bidir - Connect bidirectional\n" … … 87 89 ret -= ret & MT_MASK; 88 90 ret += MT_ESD; 91 } else if ( !strcmp(type, "simple") ) { 92 ret -= ret & MT_MASK; 93 ret += MT_SIMPLE; 89 94 } else if ( !strcmp(type, "bidir") ) { 90 95 ret -= ret & ST_MASK; … … 112 117 if ( (ret & ST_MASK) == ST_NONE ) { 113 118 switch (ret & MT_MASK) { 114 case MT_ROAR: ret |= ST_BIDIR; break; 115 case MT_ESD: ret |= ST_FILTER; break; 119 case MT_ROAR: ret |= ST_BIDIR; break; 120 case MT_ESD: ret |= ST_FILTER; break; 121 case MT_SIMPLE: ret |= ST_TRANSMIT; break; 116 122 default: 117 123 return MT_NONE|ST_NONE; // error case … … 138 144 int i; 139 145 int localdir = ROAR_DIR_BIDIR; 146 int rport; 140 147 141 148 for (i = 1; i < argc; i++) { … … 235 242 break; 236 243 #endif 244 case MT_SIMPLE: 245 switch (type & ST_MASK) { 246 case ST_TRANSMIT: 247 tmp = SHUT_RD; 248 localdir = ROAR_DIR_MONITOR; 249 break; 250 case ST_RECEIVE: 251 tmp = SHUT_WR; 252 localdir = ROAR_DIR_PLAY; 253 break; 254 default: 255 fprintf(stderr, "Error: this type is not supported by PulseAudio\n"); 256 return 2; 257 } 258 // we guess INET here... 259 if ( strstr(remote, "/") == NULL && (k = strstr(remote, ":")) != NULL ) { 260 *k = 0; 261 k++; 262 rport = atoi(k); 263 } else { 264 rport = 4712; 265 } 266 rfh = roar_socket_connect(remote, rport); 267 ROAR_SHUTDOWN(rfh, tmp); 268 break; 237 269 default: 238 270 fprintf(stderr, "Error: unknown/not supported server type\n");
Note: See TracChangeset
for help on using the changeset viewer.