RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00
Code Issues Releases Wiki Activity

gui.conf parsing moved to after gtkInit() - should fix i18n problems

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6892 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-08-04 11:09:20 +00:00
parent 16d7e60ea8
commit c784deba62
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gui/interface.c
View File

@ -82,7 +82,7 @@ void guiInit( void )
memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) ); memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
gtkAOOSSMixer=strdup( PATH_DEV_MIXER ); gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
gtkAOOSSDevice=strdup( PATH_DEV_DSP ); gtkAOOSSDevice=strdup( PATH_DEV_DSP );
cfg_read(); // cfg_read(); // !!! moved to Gui/mplayer/mplayer.c::mplInit() after gtkInit()
appInit( (void*)mDisplay ); appInit( (void*)mDisplay );
if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name ); if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name );
#if defined( USE_OSD ) || defined( USE_SUB ) #if defined( USE_OSD ) || defined( USE_SUB )

4
Gui/mplayer/mplayer.c
View File

@ -49,9 +49,11 @@ void mplInit( void * disp )
guiIntfStruct.Balance=50.0f; guiIntfStruct.Balance=50.0f;
guiIntfStruct.StreamType=-1; guiIntfStruct.StreamType=-1;
// fork() a process which runs gtkThreadProc() [gtkPID]
gtkInit(); gtkInit();
// read gui.conf, gui.pl
cfg_read();
// opens X display, checks for extensions (XShape, DGA etc) // opens X display, checks for extensions (XShape, DGA etc)
wsXInit( disp ); wsXInit( disp );