diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-04 11:09:20 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-04 11:09:20 +0000 |
| commit | c784deba62cb0104bbb6857f3f94f8cd5f82d6ff (patch) | |
| tree | d8c540eb8bec358e603a7cb06f6973754a245a62 /Gui | |
| parent | 16d7e60ea82181ded896ed2cbaa7fa423c966cab (diff) | |
| download | mpv-c784deba62cb0104bbb6857f3f94f8cd5f82d6ff.tar.bz2 mpv-c784deba62cb0104bbb6857f3f94f8cd5f82d6ff.tar.xz | |
gui.conf parsing moved to after gtkInit() - should fix i18n problems
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6892 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/interface.c | 2 | ||||
| -rw-r--r-- | Gui/mplayer/mplayer.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index d4bb15b732..f509a11db0 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -82,7 +82,7 @@ void guiInit( void ) memset( >kEquChannels,0,sizeof( gtkEquChannels ) ); gtkAOOSSMixer=strdup( PATH_DEV_MIXER ); gtkAOOSSDevice=strdup( PATH_DEV_DSP ); - cfg_read(); +// cfg_read(); // !!! moved to Gui/mplayer/mplayer.c::mplInit() after gtkInit() appInit( (void*)mDisplay ); if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name ); #if defined( USE_OSD ) || defined( USE_SUB ) diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c index 1d181eb570..d604a00e36 100644 --- a/Gui/mplayer/mplayer.c +++ b/Gui/mplayer/mplayer.c @@ -49,9 +49,11 @@ void mplInit( void * disp ) guiIntfStruct.Balance=50.0f; guiIntfStruct.StreamType=-1; - // fork() a process which runs gtkThreadProc() [gtkPID] gtkInit(); + // read gui.conf, gui.pl + cfg_read(); + // opens X display, checks for extensions (XShape, DGA etc) wsXInit( disp ); |