Mercurial > mplayer.hg

comparison gui/cfg.c @ 26422:f74bff77f088

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
noconfig fix, disable_gui_conf was not defined when compiling mencoder. Fix mencoder linking when the GUI is enabled. Patch by Norman Yarvin (yarvin -at- yarchive -dot- net).
author albeu
date Tue, 15 Apr 2008 13:20:15 +0000
parents 9d53b15aed02
children b0a7b35b78d2
comparison
equal deleted inserted replaced
26421:fb39a8d56dc2 26422:f74bff77f088
81 #endif 81 #endif
82 // --- 82 // ---
83 83
84 extern int stop_xscreensaver; 84 extern int stop_xscreensaver;
85 extern int m_config_parse_config_file(m_config_t* config, char *conffile); 85 extern int m_config_parse_config_file(m_config_t* config, char *conffile);
86 int disable_gui_conf=0; 86 extern int disable_gui_conf;
87 87
88 static m_config_t * gui_conf; 88 static m_config_t * gui_conf;
89 static const m_option_t gui_opts[] = 89 static const m_option_t gui_opts[] =
90 { 90 {
91 { "enable_audio_equ",&gtkEnableAudioEqualizer,CONF_TYPE_FLAG,0,0,1,NULL }, 91 { "enable_audio_equ",&gtkEnableAudioEqualizer,CONF_TYPE_FLAG,0,0,1,NULL },