From db2058a26580681911aed09b427472ccde0176dd Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 25 Jan 2009 17:38:06 +0100
Subject: mixer: removed mixer_configure_legacy(), AC_MIXER_CONFIGURE

Those have been superseded by the new legacy configuration code.
---
 src/audio.c            | 17 -----------------
 src/audio.h            |  1 -
 src/mixer/alsa_mixer.c |  5 -----
 src/mixer/oss_mixer.c  |  6 ------
 src/output_api.h       |  1 -
 5 files changed, 30 deletions(-)

diff --git a/src/audio.c b/src/audio.c
index 07f7f17c..854dc8a0 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 9120b957..c20f74f5 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 36ae76cc..f3213c4c 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 5185a867..504fedc6 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 b3c13335..207f72c2 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;
-- 
cgit v1.2.3