diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-12 16:05:11 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-12 16:05:11 +0000 |
commit | f630d42c8a91f08923dc09d63cfa0df5d35b253f (patch) | |
tree | 05cd6a4a6b717ecac5b06bc7caad8aee18b0aaaf /Gui/cfg.c | |
parent | 9a2b32ca829838a53fc89aeb4ee5ae7731e5df59 (diff) | |
download | mpv-f630d42c8a91f08923dc09d63cfa0df5d35b253f.tar.bz2 mpv-f630d42c8a91f08923dc09d63cfa0df5d35b253f.tar.xz |
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
Diffstat (limited to 'Gui/cfg.c')
-rw-r--r-- | Gui/cfg.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -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",>kAONorm,CONF_TYPE_FLAG,0,0,1,NULL }, + { "softvol",&soft_vol,CONF_TYPE_FLAG,0,0,1,NULL }, { "ao_surround",>kAOSurround,CONF_TYPE_FLAG,0,0,1,NULL }, { "ao_extra_stereo",>kAOExtraStereo,CONF_TYPE_FLAG,0,0,1,NULL }, { "ao_extra_stereo_coefficient",>kAOExtraStereoMul,CONF_TYPE_FLOAT,CONF_RANGE,-10,10,NULL }, @@ -124,6 +129,9 @@ static m_option_t gui_opts[] = #ifdef HAVE_SDL { "ao_sdl_subdriver",>kAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL }, #endif +#ifdef USE_ESD + { "ao_esd_device",>kAOESDDevice,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 }, |