Changeset 4421:f04e16af6d2a in roaraudio for roard/roard.c
- Timestamp:
- 10/07/10 15:58:59 (14 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/roard.c
r4418 r4421 165 165 " --sysclocksync - calculate exact sample rate using the system clock\n" 166 166 " --location LOC - Set lion readable location of server\n" 167 " --description DESC - Set lion readable description of server\n" 167 168 #ifdef SUPPORT_PIDFILE 168 169 " --pidfile PIDFILE - Write a pidfile at PIDFILE\n" … … 436 437 g_config->streams[ROAR_DIR_BIDIR ].flags = ROAR_FLAG_ANTIECHO; 437 438 438 g_config->location = "***default***"; 439 g_config->location = "***default***"; 440 g_config->description = "***default***"; 439 441 440 442 g_config->memlock_level = -1; … … 1313 1315 char attr[1024] = ""; 1314 1316 char * location; 1317 char * description; 1315 1318 1316 1319 if ( sockname != NULL ) … … 1334 1337 } 1335 1338 1339 if ( SLPEscape(g_config->description, &description, SLP_FALSE) != SLP_OK ) { 1340 ROAR_ERR("Error using SLPEscape() on server location, really bad!"); 1341 SLPClose(hslp); 1342 return -1; 1343 } 1344 1336 1345 snprintf(attr, sizeof(attr), "(wave-rate=%i),(wave-channels=%i),(wave-bits=%i)," 1337 1346 #ifndef ROAR_WITHOUT_DCOMP_LIGHT 1338 1347 "(light-channels=%i)," 1339 1348 #endif 1340 "(location=%s) ",1349 "(location=%s),(description=%s)", 1341 1350 g_sa->rate, g_sa->channels, g_sa->bits, 1342 1351 #ifndef ROAR_WITHOUT_DCOMP_LIGHT 1343 1352 g_light_state.channels, 1344 1353 #endif 1345 location 1354 location, description 1346 1355 ); 1347 1356 … … 1701 1710 _CKHAVEARGS(1); 1702 1711 g_config->location = argv[++i]; 1712 } else if ( strcmp(k, "--description") == 0 ) { 1713 _CKHAVEARGS(1); 1714 g_config->description = argv[++i]; 1703 1715 } else if ( strcmp(k, "--pidfile") == 0 ) { 1704 1716 _CKHAVEARGS(1);
Note: See TracChangeset
for help on using the changeset viewer.