diff options
author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-14 11:21:29 +0000 |
---|---|---|
committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-14 11:21:29 +0000 |
commit | 6e62b3a85fc2c7a74dd3242bf123cc5f26adaeb0 (patch) | |
tree | f049be7e07ecb9657bce2fb8e6945475583099ec /gui | |
parent | c439e8b46859edc563e3a7177c7b957acaeb7315 (diff) | |
download | mpv-6e62b3a85fc2c7a74dd3242bf123cc5f26adaeb0.tar.bz2 mpv-6e62b3a85fc2c7a74dd3242bf123cc5f26adaeb0.tar.xz |
Add options to disable some or all config files.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26448 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui')
-rw-r--r-- | gui/cfg.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -83,6 +83,7 @@ gtkASS_t gtkASS; extern int stop_xscreensaver; extern int m_config_parse_config_file(m_config_t* config, char *conffile); +int disable_gui_conf=0; static m_config_t * gui_conf; static const m_option_t gui_opts[] = @@ -222,7 +223,7 @@ int cfg_read( void ) mp_msg( MSGT_GPLAYER,MSGL_V,"[cfg] reading config file: %s\n",cfg ); gui_conf=m_config_new(); m_config_register_options( gui_conf,gui_opts ); - if ( m_config_parse_config_file( gui_conf,cfg ) < 0 ) + if ( !disable_gui_conf && m_config_parse_config_file( gui_conf,cfg ) < 0 ) { mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_ConfigFileError ); // exit( 1 ); |