comparison cfgparser.c @ 4220:fe2c20d52a25

Fixed a few bugs and added support for VCD/DVD/TV in playlist using virtual url like dvd://1 vcd://2 tv://5
author albeu
date Thu, 17 Jan 2002 20:24:28 +0000
parents 22fadd4022b5
children f04c49aa2408
comparison
equal deleted inserted replaced
4219:70888f501b4a 4220:fe2c20d52a25
298 assert(opt != NULL); 298 assert(opt != NULL);
299 #endif 299 #endif
300 300
301 mp_msg(MSGT_CFGPARSER, MSGL_DBG3, "read_option: conf=%p opt='%s' param='%s'\n", 301 mp_msg(MSGT_CFGPARSER, MSGL_DBG3, "read_option: conf=%p opt='%s' param='%s'\n",
302 conf, opt, param); 302 conf, opt, param);
303 for(nconf = 0 ; conf_list&& conf_list[nconf] != NULL; nconf++) { 303 for(nconf = 0 ; conf_list[nconf] != NULL; nconf++) {
304 conf = conf_list[nconf]; 304 conf = conf_list[nconf];
305 for (i = 0; conf[i].name != NULL; i++) { 305 for (i = 0; conf[i].name != NULL; i++) {
306 int namelength; 306 int namelength;
307 /* allow 'aa*' in config.name */ 307 /* allow 'aa*' in config.name */
308 namelength=strlen(conf[i].name); 308 namelength=strlen(conf[i].name);
561 default: 561 default:
562 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Unknown config type specified in conf-mplayer.h!\n"); 562 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Unknown config type specified in conf-mplayer.h!\n");
563 break; 563 break;
564 } 564 }
565 out: 565 out:
566 if(config->global == 0 && ! (conf[i].flags & CONF_GLOBAL)) { 566 if(ret >= 0 && config->global == 0 && ! (conf[i].flags & CONF_GLOBAL)) {
567 play_tree_t* dest = config->last_entry ? config->last_entry : config->last_parent; 567 play_tree_t* dest = config->last_entry ? config->last_entry : config->last_parent;
568 #ifdef MP_DEBUG 568 #ifdef MP_DEBUG
569 assert(dest != NULL); 569 assert(dest != NULL);
570 #endif 570 #endif
571 if(ret == 0) 571 if(ret == 0)