From 5b91ba0a8dd052d5d52309e439398f693d390b1b Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 21 Jul 2013 23:27:09 +0200
Subject: 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.
---
 core/options.c | 2 --
 core/options.h | 2 --
 2 files changed, 4 deletions(-)

(limited to 'core')

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;
-- 
cgit v1.2.3