Changeset 4653:fb6662ea5f57 in roaraudio for libroar
- Timestamp:
- 12/09/10 19:43:50 (14 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libroar
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/basic.c
r4109 r4653 37 37 38 38 int roar_connect_raw (char * server) { 39 struct roar_libroar_config * config = roar_libroar_get_config(); 39 40 char user_sock[80]; 40 41 char * roar_server; … … 136 137 137 138 #ifdef ROAR_HAVE_LIBSLP 138 if ( (server = roar_slp_find_roard(0)) != NULL ) 139 if ( (fh = roar_connect_raw(server)) != -1 ) 140 return fh; 141 142 /* in case we can not connect to the server given this may be a cache problem, 143 we do a new lookup with the cache disabled in this case */ 144 ROAR_WARN("roar_connect_raw(*): Can not connect to SLP located server, disabling cache"); 145 if ( (server = roar_slp_find_roard(1)) != NULL ) 146 if ( (fh = roar_connect_raw(server)) != -1 ) 147 return fh; 139 if ( !(config->workaround.workarounds & ROAR_LIBROAR_CONFIG_WAS_NO_SLP) ) { 140 if ( (server = roar_slp_find_roard(0)) != NULL ) 141 if ( (fh = roar_connect_raw(server)) != -1 ) 142 return fh; 143 144 /* in case we can not connect to the server given this may be a cache problem, 145 we do a new lookup with the cache disabled in this case */ 146 ROAR_WARN("roar_connect_raw(*): Can not connect to SLP located server, disabling cache"); 147 if ( (server = roar_slp_find_roard(1)) != NULL ) 148 if ( (fh = roar_connect_raw(server)) != -1 ) 149 return fh; 150 } 148 151 #endif 149 152 -
libroar/config.c
r4517 r4653 220 220 if ( !strcmp(v, "use-execed") ) { 221 221 config->workaround.workarounds |= ROAR_LIBROAR_CONFIG_WAS_USE_EXECED; 222 } else if ( !strcmp(v, "no-slp") ) { 223 config->workaround.workarounds |= ROAR_LIBROAR_CONFIG_WAS_NO_SLP; 222 224 } else { 223 225 ROAR_WARN("roar_libroar_config_parse(*): Unknown workaround option: %s", v);
Note: See TracChangeset
for help on using the changeset viewer.