summaryrefslogtreecommitdiffstats
path: root/Gui/interface.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-28 13:39:51 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-28 13:39:51 +0000
commit288868f16a20ce9d5f3586f5a6442c7b4005e7ff (patch)
tree2f407180b95347b79e09cc23f6bdfc2b5e021c24 /Gui/interface.c
parent3bf75ee497ec72d39777657f370005e8f5acdd4f (diff)
downloadmpv-288868f16a20ce9d5f3586f5a6442c7b4005e7ff.tar.bz2
mpv-288868f16a20ce9d5f3586f5a6442c7b4005e7ff.tar.xz
Lots of functions and variables specific to OSS audio are used without
ifdefs, so it is not possible to compile mplayer without enabling it, alse some are already ifdefed, so it is a mess. patch by Filip Kalinski <filon@pld.org.pl> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8601 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/interface.c')
-rw-r--r--Gui/interface.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Gui/interface.c b/Gui/interface.c
index c7266f0c39..a39f8a6434 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -163,8 +163,10 @@ void guiInit( void )
guiIntfStruct.StreamType=-1;
memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
+#ifdef USE_OSS_AUDIO
if ( !gtkAOOSSMixer ) gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
if ( !gtkAOOSSDevice ) gtkAOOSSDevice=strdup( PATH_DEV_DSP );
+#endif
#ifdef HAVE_DXR3
if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" );
#endif
@@ -691,6 +693,7 @@ int guiGetEvent( int type,char * arg )
gset( &ao_plugin_cfg.plugin_list,"extrastereo" );
ao_plugin_cfg.pl_extrastereo_mul=gtkAOExtraStereoMul;
}
+#ifdef USE_OSS_AUDIO
mixer_device=gstrdup( gtkAOOSSMixer );
if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"oss",3 ) && gtkAOOSSDevice )
{