mirror of
https://github.com/mpv-player/mpv
synced 2025-01-20 21:07:29 +01:00
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
This commit is contained in:
parent
16d7e60ea8
commit
c784deba62
@ -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 )
|
||||
|
@ -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 );
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user