mixer_control: moved functions to mixer_all.c

1 files changed, 0 insertions, 61 deletions

diff --git a/src/mixer_control.c b/src/mixer_control.c
index 66b68bde4..229c3683e 100644
--- a/src/mixer_control.c
+++ b/src/mixer_control.c
@@ -19,66 +19,5 @@
 
 #include "mixer_control.h"
 #include "mixer_api.h"
-#include "output_all.h"
-#include "output_plugin.h"
-#include "output_internal.h"
 
 #include <assert.h>
-
-bool
-mixer_control_setvol(unsigned int device, int volume, int rel)
-{
-	struct audio_output *output;
-	struct mixer *mixer;
-
-	assert(device < audio_output_count());
-
-	output = audio_output_get(device);
-	if (!output->enabled)
-		return false;
-
-	mixer = ao_plugin_get_mixer(output->plugin, output->data);
-	if (mixer != NULL) {
-		if (rel) {
-			int cur_volume = mixer_get_volume(mixer);
-			if (cur_volume < 0)
-				return false;
-
-			volume = volume + cur_volume;
-		}
-		if (volume > 100)
-			volume = 100;
-		else if (volume < 0)
-			volume = 0;
-
-		return mixer_set_volume(mixer, volume);
-	}
-	return false;
-}
-
-bool
-mixer_control_getvol(unsigned int device, int *volume)
-{
-	struct audio_output *output;
-	struct mixer *mixer;
-
-	assert(device < audio_output_count());
-
-	output = audio_output_get(device);
-	if (!output->enabled)
-		return false;
-
-	mixer = ao_plugin_get_mixer(output->plugin, output->data);
-	if (mixer != NULL) {
-		int volume2;
-
-		volume2 = mixer_get_volume(mixer);
-		if (volume2 < 0)
-			return false;
-
-		*volume = volume2;
-		return true;
-	}
-
-	return false;
-}