[MPlayer-cvslog] CVS: main/Gui cfg.c, 1.43, 1.44 cfg.h, 1.16, 1.17 interface.c, 1.103, 1.104

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/Gui
In directory mail:/var2/tmp/cvs-serv19664/Gui

Modified Files:
	cfg.c cfg.h interface.c 
Log Message:
ESD configuration dialog and software volume control option for Gui
Patch by Paul Wilhelm Elsinghorst ( paul [at] uni-bonn de )


Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cfg.c	20 Jan 2005 13:22:52 -0000	1.43
+++ cfg.c	12 Feb 2005 16:05:10 -0000	1.44
@@ -6,6 +6,7 @@
 #include "../config.h"
 #include "../mp_msg.h"
 #include "../help_mp.h"
+#include "../mixer.h"
 #include "../mplayer.h"
 #include "../m_config.h"
 #include "../m_option.h"
@@ -46,6 +47,9 @@
 #ifdef HAVE_SDL
 char * gtkAOSDLDriver;
 #endif
+#ifdef USE_ESD
+char * gtkAOESDDevice;
+#endif
 
 int    gtkCacheOn = 0;
 int    gtkCacheSize = 2048;
@@ -108,6 +112,7 @@
 
  { "ao_driver",&audio_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
  { "ao_volnorm",&gtkAONorm,CONF_TYPE_FLAG,0,0,1,NULL },
+ { "softvol",&soft_vol,CONF_TYPE_FLAG,0,0,1,NULL },
  { "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 },
@@ -124,6 +129,9 @@
 #ifdef HAVE_SDL
  { "ao_sdl_subdriver",&gtkAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL },
 #endif
+#ifdef USE_ESD
+ { "ao_esd_device",&gtkAOESDDevice,CONF_TYPE_STRING,0,0,0,NULL },
+#endif
 
  { "dvd_device",&dvd_device,CONF_TYPE_STRING,0,0,0,NULL },
  { "cdrom_device",&cdrom_device,CONF_TYPE_STRING,0,0,0,NULL },

Index: cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cfg.h	30 Jul 2004 15:58:36 -0000	1.16
+++ cfg.h	12 Feb 2005 16:05:10 -0000	1.17
@@ -25,6 +25,9 @@
 #ifdef HAVE_SDL
 extern char * gtkAOSDLDriver;
 #endif
+#ifdef USE_ESD
+extern char * gtkAOESDDevice;
+#endif
 #ifdef HAVE_DXR3
 extern char * gtkDXR3Device;
 #endif

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- interface.c	31 Jan 2005 18:16:39 -0000	1.103
+++ interface.c	12 Feb 2005 16:05:10 -0000	1.104
@@ -875,6 +875,19 @@
 	  free(tmp);
 	 }
 #endif
+#ifdef USE_ESD
+	if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"esd",3 ) )
+	 {
+	  char *tmp;
+	  if (gtkAOESDDevice) {
+	  tmp = calloc( 1,strlen( gtkAOESDDevice ) + 10 );
+	  sprintf( tmp,"esd:%s",gtkAOESDDevice );
+	  } else
+	    tmp = strdup("esd");
+	  gaddlist( &audio_driver_list,tmp );
+	  free(tmp);
+	 }
+#endif
 // -- subtitle
 #ifdef USE_SUB
 	//subdata->filename=gstrdup( guiIntfStruct.Subtitlename );