1 files changed, 29 insertions, 183 deletions

diff --git a/src/volume.c b/src/volume.c
index e7fa20a62..5f4a66837 100644
--- a/src/volume.c
+++ b/src/volume.c
@@ -26,6 +26,7 @@
 #include "output_all.h"
 #include "mixer_control.h"
 #include "mixer_all.h"
+#include "mixer_type.h"
 
 #include <glib.h>
 
@@ -39,13 +40,7 @@
 
 #define SW_VOLUME_STATE                         "sw_volume: "
 
-static enum {
-	VOLUME_MIXER_TYPE_SOFTWARE,
-	VOLUME_MIXER_TYPE_HARDWARE,
-	VOLUME_MIXER_TYPE_DISABLED,
-} volume_mixer_type = VOLUME_MIXER_TYPE_HARDWARE;
-
-static int volume_software_set = 100;
+static unsigned volume_software_set = 100;
 
 /** the cached hardware mixer value; invalid if negative */
 static int last_hardware_volume = -1;
@@ -54,117 +49,15 @@ static GTimer *hardware_volume_timer;
 
 void volume_finish(void)
 {
-	if (volume_mixer_type == VOLUME_MIXER_TYPE_HARDWARE)
-		g_timer_destroy(hardware_volume_timer);
-}
-
-/**
- * Finds the first audio_output configuration section with the
- * specified type.
- */
-static struct config_param *
-find_output_config(const char *type)
-{
-	struct config_param *param = NULL;
-
-	while ((param = config_get_next_param(CONF_AUDIO_OUTPUT,
-					      param)) != NULL) {
-		const char *param_type =
-			config_get_block_string(param, "type", NULL);
-		if (param_type != NULL && strcmp(param_type, type) == 0)
-			return param;
-	}
-
-	return NULL;
-}
-
-/**
- * Copy a (top-level) legacy mixer configuration parameter to the
- * audio_output section.
- */
-static void
-mixer_copy_legacy_param(const char *type, const char *name)
-{
-	const struct config_param *param;
-	struct config_param *output;
-	const struct block_param *bp;
-
-	/* see if the deprecated configuration exists */
-
-	param = config_get_param(name);
-	if (param == NULL)
-		return;
-
-	g_warning("deprecated option '%s' found, moving to '%s' audio output",
-		  name, type);
-
-	/* determine the configuration section */
-
-	output = find_output_config(type);
-	if (output == NULL) {
-		/* if there is no output configuration at all, create
-		   a new and empty configuration section for the
-		   legacy mixer */
-
-		if (config_get_next_param(CONF_AUDIO_OUTPUT, NULL) != NULL)
-			/* there is an audio_output configuration, but
-			   it does not match the mixer_type setting */
-			g_error("no '%s' audio output found", type);
-
-		output = config_new_param(NULL, param->line);
-		config_add_block_param(output, "type", type, param->line);
-		config_add_block_param(output, "name", type, param->line);
-		config_add_param(CONF_AUDIO_OUTPUT, output);
-	}
-
-	bp = config_get_block_param(output, name);
-	if (bp != NULL)
-		g_error("the '%s' audio output already has a '%s' setting",
-			type, name);
-
-	/* duplicate the parameter in the configuration section */
-
-	config_add_block_param(output, name, param->value, param->line);
-}
-
-static void
-mixer_reconfigure(const char *type)
-{
-	mixer_copy_legacy_param(type, CONF_MIXER_DEVICE);
-	mixer_copy_legacy_param(type, CONF_MIXER_CONTROL);
+	g_timer_destroy(hardware_volume_timer);
 }
 
 void volume_init(void)
 {
-	const struct config_param *param = config_get_param(CONF_MIXER_TYPE);
-	//hw mixing is by default
-	if (param) {
-		if (strcmp(param->value, VOLUME_MIXER_SOFTWARE) == 0) {
-			volume_mixer_type = VOLUME_MIXER_TYPE_SOFTWARE;
-			mixer_disable_all();
-		} else if (strcmp(param->value, VOLUME_MIXER_DISABLED) == 0) {
-			volume_mixer_type = VOLUME_MIXER_TYPE_DISABLED;
-			mixer_disable_all();
-		} else if (strcmp(param->value, VOLUME_MIXER_HARDWARE) == 0) {
-			//nothing to do
-		} else {
-			//fallback to old config behaviour
-			if (strcmp(param->value, VOLUME_MIXER_OSS) == 0) {
-				mixer_reconfigure(param->value);
-			} else if (strcmp(param->value, VOLUME_MIXER_ALSA) == 0) {
-				mixer_reconfigure(param->value);
-			} else {
-				g_error("unknown mixer type %s at line %i\n",
-					param->value, param->line);
-			}
-		}
-	}
-
-	if (volume_mixer_type == VOLUME_MIXER_TYPE_HARDWARE)
-		hardware_volume_timer = g_timer_new();
+	hardware_volume_timer = g_timer_new();
 }
 
-static int hardware_volume_get(void)
+int volume_level_get(void)
 {
 	assert(hardware_volume_timer != NULL);
 
@@ -178,101 +71,54 @@ static int hardware_volume_get(void)
 	return last_hardware_volume;
 }
 
-static int software_volume_get(void)
+static bool software_volume_change(unsigned volume)
 {
-	return volume_software_set;
-}
+	assert(volume <= 100);
 
-int volume_level_get(void)
-{
-	switch (volume_mixer_type) {
-	case VOLUME_MIXER_TYPE_SOFTWARE:
-		return software_volume_get();
-	case VOLUME_MIXER_TYPE_HARDWARE:
-		return hardware_volume_get();
-	case VOLUME_MIXER_TYPE_DISABLED:
-		return -1;
-	}
-
-	/* unreachable */
-	assert(false);
-	return -1;
-}
-
-static bool software_volume_change(int change, bool rel)
-{
-	int new = change;
-
-	if (rel)
-		new += volume_software_set;
-
-	if (new > 100)
-		new = 100;
-	else if (new < 0)
-		new = 0;
-
-	volume_software_set = new;
-
-	/*new = 100.0*(exp(new/50.0)-1)/(M_E*M_E-1)+0.5; */
-	if (new >= 100)
-		new = PCM_VOLUME_1;
-	else if (new <= 0)
-		new = 0;
-	else
-		new = pcm_float_to_volume((exp(new / 25.0) - 1) /
-					  (54.5981500331F - 1));
-
-	setPlayerSoftwareVolume(new);
+	volume_software_set = volume;
+	mixer_all_set_software_volume(volume);
 
 	return true;
 }
 
-static bool hardware_volume_change(int change, bool rel)
+static bool hardware_volume_change(unsigned volume)
 {
 	/* reset the cache */
 	last_hardware_volume = -1;
 
-	return mixer_all_set_volume(change, rel);
+	return mixer_all_set_volume(volume);
 }
 
-bool volume_level_change(int change, bool rel)
+bool volume_level_change(unsigned volume)
 {
+	assert(volume <= 100);
+
+	volume_software_set = volume;
+
 	idle_add(IDLE_MIXER);
 
-	switch (volume_mixer_type) {
-	case VOLUME_MIXER_TYPE_HARDWARE:
-		return hardware_volume_change(change, rel);
-	case VOLUME_MIXER_TYPE_SOFTWARE:
-		return software_volume_change(change, rel);
-	default:
-		return true;
-	}
+	return hardware_volume_change(volume);
 }
 
-void read_sw_volume_state(FILE *fp)
+bool
+read_sw_volume_state(const char *line)
 {
-	char buf[sizeof(SW_VOLUME_STATE) + sizeof("100") - 1];
 	char *end = NULL;
 	long int sv;
 
-	if (volume_mixer_type != VOLUME_MIXER_TYPE_SOFTWARE)
-		return;
-	while (fgets(buf, sizeof(buf), fp)) {
-		if (!g_str_has_prefix(buf, SW_VOLUME_STATE))
-			continue;
+	if (!g_str_has_prefix(line, SW_VOLUME_STATE))
+		return false;
 
-		g_strchomp(buf);
-		sv = strtol(buf + strlen(SW_VOLUME_STATE), &end, 10);
-		if (G_LIKELY(!*end))
-			software_volume_change(sv, 0);
-		else
-			g_warning("Can't parse software volume: %s\n", buf);
-		return;
-	}
+	line += sizeof(SW_VOLUME_STATE) - 1;
+	sv = strtol(line, &end, 10);
+	if (*end == 0 && sv >= 0 && sv <= 100)
+		software_volume_change(sv);
+	else
+		g_warning("Can't parse software volume: %s\n", line);
+	return true;
 }
 
 void save_sw_volume_state(FILE *fp)
 {
-	if (volume_mixer_type == VOLUME_MIXER_TYPE_SOFTWARE)
-		fprintf(fp, SW_VOLUME_STATE "%d\n", volume_software_set);
+	fprintf(fp, SW_VOLUME_STATE "%u\n", volume_software_set);
 }