summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-21 23:27:09 +0200
committerwm4 <wm4@nowhere>2013-07-21 23:35:14 +0200
commit5b91ba0a8dd052d5d52309e439398f693d390b1b (patch)
tree7e808ef5420e188fdf736261f7a6ed17c0ec174a /core
parent5c610836cd0a301944d018f2020e0304e8b186fa (diff)
downloadmpv-5b91ba0a8dd052d5d52309e439398f693d390b1b.tar.bz2
mpv-5b91ba0a8dd052d5d52309e439398f693d390b1b.tar.xz
options: remove --mixer and --mixer-channel, turn them into alsa/oss subopts
These two options were supported by ALSA and OSS only. Further, their values were specific to the respective audio systems, so it doesn't make sense to keep them as top-level options.
Diffstat (limited to 'core')
-rw-r--r--core/options.c2
-rw-r--r--core/options.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/core/options.c b/core/options.c
index eceb1f259f..2fa6e319ab 100644
--- a/core/options.c
+++ b/core/options.c
@@ -526,8 +526,6 @@ const m_option_t mp_opts[] = {
OPT_FLAG("ontop", vo.ontop, 0),
OPT_FLAG("border", vo.border, 0),
- OPT_STRING("mixer", mixer_device, 0),
- OPT_STRING("mixer-channel", mixer_channel, 0),
OPT_CHOICE("softvol", softvol, 0,
({"no", SOFTVOL_NO},
{"yes", SOFTVOL_YES},
diff --git a/core/options.h b/core/options.h
index 44ca1148b9..212c3c79c9 100644
--- a/core/options.h
+++ b/core/options.h
@@ -49,8 +49,6 @@ typedef struct MPOpts {
struct m_obj_settings *audio_driver_list;
int fixed_vo;
- char *mixer_device;
- char *mixer_channel;
int softvol;
float mixer_init_volume;
int mixer_init_mute;