Mercurial > mplayer.hg

diff Gui/interface.c @ 7706:90044efe01ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- better dxr3 support - fix oss subdevice bug - add some warning fix from Dominik Mierzejewski <dominik@rangers.eu.org>
author pontscho
date Thu, 10 Oct 2002 14:06:49 +0000
parents 4a233f3b09a7
children b3c7c62c106c
line wrap: on
line diff
--- a/Gui/interface.c	Thu Oct 10 12:47:33 2002 +0000
+++ b/Gui/interface.c	Thu Oct 10 14:06:49 2002 +0000
@@ -155,14 +155,13 @@
  guiIntfStruct.StreamType=-1;
 
  memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
- gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
- gtkAOOSSDevice=strdup( PATH_DEV_DSP );
+ if ( !gtkAOOSSMixer ) gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
+ if ( !gtkAOOSSDevice ) gtkAOOSSDevice=strdup( PATH_DEV_DSP );
+ if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" );
  fullscreen=gtkLoadFullscreen;       
    
  gtkInit();
  wsXInit( (void *)mDisplay );
-     
-// cfg_read(); 
  appInit( (void*)mDisplay );
 
  if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE );