diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-07-30 15:58:36 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-07-30 15:58:36 +0000 |
commit | e5b67089c763989c5215f8603102415b3f8c3070 (patch) | |
tree | b633199bba862eeac66de0a8c91e1c4597c4f7d3 /Gui/cfg.c | |
parent | c13550e85ad10ad6994c21115e5f492dc6e3ae76 (diff) | |
download | mpv-e5b67089c763989c5215f8603102415b3f8c3070.tar.bz2 mpv-e5b67089c763989c5215f8603102415b3f8c3070.tar.xz |
unified audio options dialog, fixes also bug #40
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12919 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/cfg.c')
-rw-r--r-- | Gui/cfg.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -38,8 +38,14 @@ int gtkAOExtraStereo = 0; float gtkAOExtraStereoMul = 1.0; #ifdef USE_OSS_AUDIO char * gtkAOOSSMixer; +char * gtkAOOSSMixerChannel; char * gtkAOOSSDevice; #endif +#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +char * gtkAOALSAMixer; +char * gtkAOALSAMixerChannel; +char * gtkAOALSADevice; +#endif #ifdef HAVE_SDL char * gtkAOSDLDriver; #endif @@ -110,8 +116,14 @@ static m_option_t gui_opts[] = { "ao_extra_stereo_coefficient",>kAOExtraStereoMul,CONF_TYPE_FLOAT,CONF_RANGE,-10,10,NULL }, #ifdef USE_OSS_AUDIO { "ao_oss_mixer",>kAOOSSMixer,CONF_TYPE_STRING,0,0,0,NULL }, + { "ao_oss_mixer_channel",>kAOOSSMixerChannel,CONF_TYPE_STRING,0,0,0,NULL }, { "ao_oss_device",>kAOOSSDevice,CONF_TYPE_STRING,0,0,0,NULL }, #endif +#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) + { "ao_alsa_mixer",>kAOALSAMixer,CONF_TYPE_STRING,0,0,0,NULL }, + { "ao_alsa_mixer_channel",>kAOALSAMixerChannel,CONF_TYPE_STRING,0,0,0,NULL }, + { "ao_alsa_device",>kAOALSADevice,CONF_TYPE_STRING,0,0,0,NULL }, +#endif #ifdef HAVE_SDL { "ao_sdl_subdriver",>kAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL }, #endif |