Changeset 961:ac5a0e9430cf in roaraudio
- Timestamp:
- 12/08/08 22:50:14 (15 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/roard.c
r941 r961 60 60 printf(" -oO OPTS - Set output options\n"); 61 61 printf(" -oN - Adds another output\n"); 62 printf(" -oP - Mark output as primary\n"); 62 63 63 64 printf("\nSource Options:\n\n"); … … 122 123 #define R_SETGID 2 123 124 124 int add_output (char * drv, char * dev, char * opts ) {125 int add_output (char * drv, char * dev, char * opts, int prim) { 125 126 int stream; 126 127 struct roar_stream * s; … … 192 193 193 194 client_stream_add(g_source_client, stream); 195 196 if ( prim ) 197 streams_mark_primary(stream); 194 198 195 199 return 0; … … 217 221 char * o_dev = NULL; 218 222 char * o_opts = NULL; 223 int o_prim = 0; 219 224 char * sock_grp = ROAR_DEFAULT_SOCKGRP; 220 225 char * sock_user = NULL; … … 330 335 } else if ( strcmp(k, "-oO") == 0 ) { 331 336 o_opts = argv[++i]; 337 } else if ( strcmp(k, "-oP") == 0 ) { 338 o_prim = 1; 332 339 } else if ( strcmp(k, "-oN") == 0 ) { 333 add_output(o_drv, o_dev, o_opts); 334 o_drv = o_dev = o_opts = NULL; 340 add_output(o_drv, o_dev, o_opts, o_prim); 341 o_drv = o_dev = o_opts = NULL; 342 o_prim = 0; 335 343 336 344 } else if ( strcmp(k, "-s") == 0 || strcmp(k, "--source") == 0 ) { … … 433 441 434 442 if ( o_drv != NULL ) 435 add_output(o_drv, o_dev, o_opts );443 add_output(o_drv, o_dev, o_opts, o_prim); 436 444 437 445 ROAR_DBG("Server config: rate=%i, bits=%i, chans=%i", sa.rate, sa.bits, sa.channels);
Note: See TracChangeset
for help on using the changeset viewer.