diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-10 14:06:49 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-10 14:06:49 +0000 |
commit | 853b795d3c892d53f81440c0e89644beac9390cc (patch) | |
tree | d496999e8b0ed8bd251bbb6995540606a329d059 /Gui/interface.c | |
parent | cc6c1614f40f5baf147a44d6e1af9162c44b1fd5 (diff) | |
download | mpv-853b795d3c892d53f81440c0e89644beac9390cc.tar.bz2 mpv-853b795d3c892d53f81440c0e89644beac9390cc.tar.xz |
- better dxr3 support
- fix oss subdevice bug
- add some warning fix from Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7707 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/interface.c')
-rw-r--r-- | Gui/interface.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index 7dc80998c5..e80eb66dc7 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -155,14 +155,13 @@ void guiInit( void ) guiIntfStruct.StreamType=-1; memset( >kEquChannels,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 ); |