Changeset 4442:2d3a1ad3edcc in roaraudio


Ignore:
Timestamp:
10/09/10 16:02:44 (8 years ago)
Author:
phi
Branch:
default
Message:

make config default string symbolic, do not use it for server_info.

Location:
roard
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • roard/include/roard.h

    r4421 r4442  
    177177struct roar_audio_info * g_sa, * g_max_sa; 
    178178 
     179#define CONF_DEF_STRING "***default***" 
     180 
    179181struct roard_config { 
    180182 uint32_t flags; 
  • roard/req.c

    r4441 r4442  
    562562 
    563563   info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">"; 
    564    info.location = g_config->location; 
     564 
     565   if ( !!strcmp(g_config->location, CONF_DEF_STRING) ) 
     566    info.location = g_config->location; 
     567 
     568   if ( !!strcmp(g_config->description, CONF_DEF_STRING) ) 
    565569   info.description = g_config->description; 
    566570 
  • roard/roard.c

    r4423 r4442  
    437437 g_config->streams[ROAR_DIR_BIDIR   ].flags = ROAR_FLAG_ANTIECHO; 
    438438 
    439  g_config->location    = "***default***"; 
    440  g_config->description = "***default***"; 
     439 g_config->location    = CONF_DEF_STRING; 
     440 g_config->description = CONF_DEF_STRING; 
    441441 
    442442 g_config->memlock_level = -1; 
Note: See TracChangeset for help on using the changeset viewer.