Changeset 2017:419fb879b9e3 in roaraudio
- Timestamp:
- 06/19/09 16:25:43 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/include/roard.h
r1993 r2017 124 124 int mixer_channels; 125 125 } streams[ROAR_DIR_DIRIDS]; 126 char * location; 126 127 } * g_config; 127 128 -
roard/roard.c
r2016 r2017 44 44 " --setuid - UserID to the audio user as specified via -U\n" 45 45 " --sysclocksync - calculate exact sample rate using the system clock\n" 46 " --location LOC - Set lion readable location of server\n" 46 47 ); 47 48 … … 157 158 g_config->streams[ROAR_DIR_MIDI_OUT].flags = ROAR_FLAG_SYNC; 158 159 160 g_config->location = "***default***"; 161 159 162 return 0; 160 163 } … … 379 382 char addr[1024]; 380 383 char attr[1024] = ""; 384 char * location; 381 385 382 386 if ( sockname != NULL ) … … 393 397 394 398 if (!unreg) { 399 400 if ( SLPEscape(g_config->location, &location, SLP_FALSE) != SLP_OK ) { 401 ROAR_ERR("Error using SLPEscape() on server location, really bad!"); 402 SLPClose(hslp); 403 return -1; 404 } 405 395 406 snprintf(attr, sizeof(attr), "(wave-rate=%i),(wave-channels=%i),(wave-bits=%i)," 396 "(light-channels=%i) ",407 "(light-channels=%i),(location=%s)", 397 408 g_sa->rate, g_sa->channels, g_sa->bits, 398 g_light_state.channels 409 g_light_state.channels, 410 location 399 411 ); 400 412 … … 631 643 ROAR_ERR("--setuid not supported"); 632 644 #endif 645 } else if ( strcmp(k, "--location") == 0 ) { 646 g_config->location = argv[++i]; 633 647 634 648 } else if ( strcmp(k, "--list-cf") == 0 ) {
Note: See TracChangeset
for help on using the changeset viewer.