[Mplayer-cvslog] CVS: main/Gui cfg.c,1.24,1.25 cfg.h,1.9,1.10 interface.c,1.65,1.66

[Arpi of Ize]

Update of /cvsroot/mplayer/main/Gui
In directory mail:/var/tmp.root/cvs-serv1157/Gui

Modified Files:
	cfg.c cfg.h interface.c 
Log Message:
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 at pld.org.pl>


Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cfg.c	28 Nov 2002 23:17:10 -0000	1.24
+++ cfg.c	28 Dec 2002 13:39:50 -0000	1.25
@@ -36,8 +36,10 @@
 int    gtkAOSurround = 0;
 int    gtkAOExtraStereo = 0;
 float  gtkAOExtraStereoMul = 1.0;
+#ifdef USE_OSS_AUDIO
 char * gtkAOOSSMixer;
 char * gtkAOOSSDevice;
+#endif
 
 int    gtkCacheOn = 0;
 int    gtkCacheSize = 2048;
@@ -96,8 +98,10 @@
  { "ao_surround",&gtkAOSurround,CONF_TYPE_FLAG,0,0,1,NULL },
  { "ao_extra_stereo",&gtkAOExtraStereo,CONF_TYPE_FLAG,0,0,1,NULL },
  { "ao_extra_stereo_coefficient",&gtkAOExtraStereoMul,CONF_TYPE_FLOAT,CONF_RANGE,-10,10,NULL },
+#ifdef USE_OSS_AUDIO
  { "ao_oss_mixer",&gtkAOOSSMixer,CONF_TYPE_STRING,0,0,0,NULL },
  { "ao_oss_device",&gtkAOOSSDevice,CONF_TYPE_STRING,0,0,0,NULL },
+#endif
  
  { "osd_level",&osd_level,CONF_TYPE_INT,CONF_RANGE,0,2,NULL },
  { "sub_auto_load",&sub_auto,CONF_TYPE_FLAG,0,0,1,NULL },

Index: cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cfg.h	28 Nov 2002 23:17:10 -0000	1.9
+++ cfg.h	28 Dec 2002 13:39:50 -0000	1.10
@@ -13,9 +13,13 @@
 extern int    gtkAOFakeSurround;
 extern int    gtkAOExtraStereo;
 extern float  gtkAOExtraStereoMul;
+#ifdef USE_OSS_AUDIO
 extern char * gtkAOOSSMixer;
 extern char * gtkAOOSSDevice;
+#endif
+#ifdef HAVE_DXR3
 extern char * gtkDXR3Device;
+#endif
 
 extern int    gtkCacheOn;
 extern int    gtkCacheSize;

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- interface.c	16 Dec 2002 22:24:56 -0000	1.65
+++ interface.c	28 Dec 2002 13:39:50 -0000	1.66
@@ -163,8 +163,10 @@
  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 @@
 	  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 )
 	 {