diff options
author | Max Kellermann <max@duempel.org> | 2009-01-25 17:38:06 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-01-25 17:38:06 +0100 |
commit | db2058a26580681911aed09b427472ccde0176dd (patch) | |
tree | 690ddf78cc11e529a00742b6856f054b2bc2f2c1 | |
parent | 188f9e663cbc109e2dc367eb7995dd8dd3fdf90f (diff) | |
download | mpd-db2058a26580681911aed09b427472ccde0176dd.tar.gz mpd-db2058a26580681911aed09b427472ccde0176dd.tar.xz mpd-db2058a26580681911aed09b427472ccde0176dd.zip |
mixer: removed mixer_configure_legacy(), AC_MIXER_CONFIGURE
Those have been superseded by the new legacy configuration code.
-rw-r--r-- | src/audio.c | 17 | ||||
-rw-r--r-- | src/audio.h | 1 | ||||
-rw-r--r-- | src/mixer/alsa_mixer.c | 5 | ||||
-rw-r--r-- | src/mixer/oss_mixer.c | 6 | ||||
-rw-r--r-- | src/output_api.h | 1 |
5 files changed, 0 insertions, 30 deletions
diff --git a/src/audio.c b/src/audio.c index 07f7f17cb..854dc8a05 100644 --- a/src/audio.c +++ b/src/audio.c @@ -466,20 +466,3 @@ bool mixer_control_getvol(unsigned int device, int *volume) } return false; } - -bool mixer_configure_legacy(char *name, struct config_param *param) -{ - unsigned i; - struct audio_output *output; - - for (i = 0; i < audioOutputArraySize; ++i) { - output = &audioOutputArray[i]; - if (output && output->plugin && !strcmp(name, output->plugin->name)) { - if (output->plugin->control) { - g_debug("reconfiguring %s mixer\n", name); - return output->plugin->control(output->data, AC_MIXER_CONFIGURE, param); - } - } - } - return false; -} diff --git a/src/audio.h b/src/audio.h index 9120b9573..c20f74f54 100644 --- a/src/audio.h +++ b/src/audio.h @@ -73,6 +73,5 @@ void saveAudioDevicesState(FILE *fp); bool mixer_control_setvol(unsigned int device, int volume, int rel); bool mixer_control_getvol(unsigned int device, int *volume); -bool mixer_configure_legacy(char *name, struct config_param *param); #endif diff --git a/src/mixer/alsa_mixer.c b/src/mixer/alsa_mixer.c index 36ae76cc9..f3213c4cf 100644 --- a/src/mixer/alsa_mixer.c +++ b/src/mixer/alsa_mixer.c @@ -162,11 +162,6 @@ alsa_mixer_control(struct mixer_data *data, int cmd, void *arg) { struct alsa_mixer *am = (struct alsa_mixer *)data; switch (cmd) { - case AC_MIXER_CONFIGURE: - alsa_mixer_configure(data, (const struct config_param *)arg); - if (am->handle) - alsa_mixer_close(data); - return true; case AC_MIXER_GETVOL: { int err; diff --git a/src/mixer/oss_mixer.c b/src/mixer/oss_mixer.c index 5185a867d..504fedc67 100644 --- a/src/mixer/oss_mixer.c +++ b/src/mixer/oss_mixer.c @@ -153,12 +153,6 @@ oss_mixer_control(struct mixer_data *data, int cmd, void *arg) { struct oss_mixer *om = (struct oss_mixer *) data; switch (cmd) { - case AC_MIXER_CONFIGURE: - oss_mixer_configure(data, (const struct config_param *)arg); - if (om->device_fd >= 0) - oss_mixer_close(data); - return true; - break; case AC_MIXER_GETVOL: { int left, right, level; diff --git a/src/output_api.h b/src/output_api.h index b3c13335c..207f72c2d 100644 --- a/src/output_api.h +++ b/src/output_api.h @@ -127,7 +127,6 @@ enum audio_output_command { enum audio_control_command { AC_MIXER_GETVOL = 0, AC_MIXER_SETVOL, - AC_MIXER_CONFIGURE, }; struct audio_output; |