Mercurial > mplayer.hg

changeset 6891:e1c5f3128b3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gui.conf parsing moved to after gtkInit() - should fix i18n problems
author arpi
date Sun, 04 Aug 2002 11:09:20 +0000
parents cc48a4233992
children b8e0b1c54940
files Gui/interface.c Gui/mplayer/mplayer.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/interface.c	Sun Aug 04 09:21:32 2002 +0000
+++ b/Gui/interface.c	Sun Aug 04 11:09:20 2002 +0000
@@ -82,7 +82,7 @@
  memset( &gtkEquChannels,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 )
--- a/Gui/mplayer/mplayer.c	Sun Aug 04 09:21:32 2002 +0000
+++ b/Gui/mplayer/mplayer.c	Sun Aug 04 11:09:20 2002 +0000
@@ -49,9 +49,11 @@
  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 );