ESD configuration dialog and software volume control option for Gui

Patch by Paul Wilhelm Elsinghorst ( paul [at] uni-bonn de )


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14687 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 8 insertions, 0 deletions

diff --git a/Gui/cfg.c b/Gui/cfg.c
index b24124739d..f7d2a68b3f 100644
--- a/Gui/cfg.c
+++ b/Gui/cfg.c
@@ -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 @@ char * gtkAOALSADevice;
 #ifdef HAVE_SDL
 char * gtkAOSDLDriver;
 #endif
+#ifdef USE_ESD
+char * gtkAOESDDevice;
+#endif
 
 int    gtkCacheOn = 0;
 int    gtkCacheSize = 2048;
@@ -108,6 +112,7 @@ static m_option_t gui_opts[] =
 
  { "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 @@ static m_option_t gui_opts[] =
 #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 },