Changeset 5380:0504bc7766aa in roaraudio for roarclients/roarinterconnect.c
- Timestamp:
- 01/04/12 21:36:22 (12 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roarclients/roarinterconnect.c
r5289 r5380 67 67 #define ST_TRANSMIT 0x03 68 68 #define ST_RECEIVE 0x04 69 #define ST_RECPLAY 0x05 70 #define ST_RECORD 0x06 69 71 // no default here as the default depend on the server type 70 72 … … 102 104 " transmit - Transmit data from local server to remote server\n" 103 105 " receive - Receive data from remote server\n" 106 " recplay - Record from and play data to remote server\n" 107 " record - Record data from remote server\n" 104 108 ); 105 109 … … 144 148 ret -= ret & ST_MASK; 145 149 ret += ST_RECEIVE; 150 } else if ( !strcmp(type, "recplay") ) { 151 ret -= ret & ST_MASK; 152 ret += ST_RECPLAY; 153 } else if ( !strcmp(type, "record") ) { 154 ret -= ret & ST_MASK; 155 ret += ST_RECORD; 146 156 } else { 147 157 return MT_NONE|ST_NONE; … … 174 184 #ifdef _HAVE_RSOUND 175 185 // RSound format helper function: 176 enum rsd_format para2rsdfmt ( int bits, int codec) {186 enum rsd_format para2rsdfmt (uint32_t bits, uint32_t codec) { 177 187 switch (codec) { 178 188 case ROAR_CODEC_PCM_S_LE: … … 318 328 localdir = ROAR_DIR_PLAY; 319 329 break; 330 case ST_RECPLAY: 331 tmp = ROAR_DIR_RECPLAY; 332 break; 333 case ST_RECORD: 334 tmp = ROAR_DIR_RECORD; 335 localdir = ROAR_DIR_PLAY; 336 break; 320 337 default: 321 338 fprintf(stderr, "Error: unknown stream type\n"); … … 343 360 break; 344 361 case ST_RECEIVE: 362 tmp = ROAR_DIR_MONITOR; 363 localdir = ROAR_DIR_PLAY; 364 break; 365 case ST_RECPLAY: 366 tmp = ROAR_DIR_RECPLAY; 367 break; 368 case ST_RECORD: 345 369 tmp = ROAR_DIR_RECORD; 346 370 localdir = ROAR_DIR_PLAY; … … 400 424 case ST_TRANSMIT: 401 425 rfh = esd_play_stream(tmp, rate, remote, CLIENT_NAME); 426 localdir = ROAR_DIR_MONITOR; 402 427 break; 403 428 case ST_RECEIVE: 404 429 rfh = esd_monitor_stream(tmp, rate, remote, CLIENT_NAME); 430 localdir = ROAR_DIR_PLAY; 405 431 break; 406 432 default:
Note: See TracChangeset
for help on using the changeset viewer.