Changeset 5289:ddb3677af4d0 in roaraudio for roarclients
- Timestamp:
- 11/22/11 14:47:44 (12 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roarclients
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
roarclients/roarfilt.c
r5180 r5289 244 244 if ( roar_vio_simple_stream(&svio, 245 245 info.rate, info.channels, info.bits, info.codec, 246 server, ROAR_DIR_FILTER, "roarfilt" ) == -1 ) {246 server, ROAR_DIR_FILTER, "roarfilt", -1) == -1 ) { 247 247 fprintf(stderr, "Error: can not start playback\n"); 248 248 return 1; -
roarclients/roarinterconnect.c
r5238 r5289 322 322 return 2; 323 323 } 324 if ( roar_vio_simple_stream(&vio, rate, channels, bits, codec, remote, tmp, CLIENT_NAME ) == -1 ) {324 if ( roar_vio_simple_stream(&vio, rate, channels, bits, codec, remote, tmp, CLIENT_NAME, -1) == -1 ) { 325 325 fprintf(stderr, "Error: can not open RoarAudio stream to %s: %s\n", remote, roar_error2str(roar_error)); 326 326 return 2; -
roarclients/roarlight.c
r4914 r5289 35 35 36 36 printf(" --server SERVER - Set server hostname\n" 37 " --mixer MIXERID - ID of the light mixer to use\n" 37 38 " --help - Show this help\n" 38 39 ); … … 46 47 } 47 48 48 int cmd_set (CONVAR, char * arg ) {49 int cmd_set (CONVAR, char * arg, const int mixer) { 49 50 char * next = arg; 50 51 char * k, * v; … … 80 81 if ( roar_vio_simple_new_stream_obj(&vio, con, NULL, 81 82 ROAR_RATE_DEFAULT, ROAR_CHANNELS_DEFAULT, ROAR_BITS_DEFAULT, 82 ROAR_CODEC_ROARDMX, ROAR_DIR_LIGHT_IN ) == -1 )83 ROAR_CODEC_ROARDMX, ROAR_DIR_LIGHT_IN, mixer) == -1 ) 83 84 return -1; 84 85 … … 94 95 95 96 int main (int argc, char * argv[]) { 97 struct roar_connection con; 98 int mixer = -1; // -1 = Default 96 99 char * server = NULL; 97 100 char * k; 98 101 int i; 99 struct roar_connection con;100 102 101 103 for (i = 1; i < argc; i++) { … … 104 106 if ( !strcmp(k, "--server") || !strcmp(k, "-s") ) { 105 107 server = argv[++i]; 108 } else if ( !strcmp(k, "--mixer") ) { 109 mixer = atoi(argv[++i]); 106 110 } else if ( !strcmp(k, "--codec") ) { 107 111 … … 142 146 } else if ( !strcmp(k, "set") ) { 143 147 i++; 144 if ( cmd_set(&con, argv[i] ) == -1 ) {148 if ( cmd_set(&con, argv[i], mixer) == -1 ) { 145 149 fprintf(stderr, "Error: can not set channels\n"); 146 150 } else { -
roarclients/roarphone.c
r4883 r5289 168 168 if ( (fh = roar_vio_simple_new_stream_obj(vio, &(g_cons.con), &(g_cons.stream), 169 169 info->rate, info->channels, info->bits, info->codec, 170 ROAR_DIR_BIDIR 170 ROAR_DIR_BIDIR, -1 171 171 )) == -1 ) 172 172 return -1; -
roarclients/roarvumeter.c
r5179 r5289 220 220 } 221 221 222 if ( roar_vio_simple_new_stream_obj(&stream, &con, &s, rate, channels, bits, codec, ROAR_DIR_MONITOR ) == -1) {222 if ( roar_vio_simple_new_stream_obj(&stream, &con, &s, rate, channels, bits, codec, ROAR_DIR_MONITOR, -1) == -1) { 223 223 fprintf(stderr, "Error: can not start monetoring\n"); 224 224 return 1;
Note: See TracChangeset
for help on using the changeset viewer.