aboutsummaryrefslogtreecommitdiffstats
path: root/src/mixer_all.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mixer_all.c')
-rw-r--r--src/mixer_all.c65
1 files changed, 61 insertions, 4 deletions
diff --git a/src/mixer_all.c b/src/mixer_all.c
index de5856bbb..b4ac024b9 100644
--- a/src/mixer_all.c
+++ b/src/mixer_all.c
@@ -18,14 +18,37 @@
*/
#include "mixer_all.h"
-#include "mixer_control.h"
+#include "mixer_api.h"
#include "output_all.h"
+#include "output_plugin.h"
+#include "output_internal.h"
#include <glib.h>
+#include <assert.h>
+
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "mixer"
+static int
+output_mixer_get_volume(unsigned i)
+{
+ struct audio_output *output;
+ struct mixer *mixer;
+
+ assert(i < audio_output_count());
+
+ output = audio_output_get(i);
+ if (!output->enabled)
+ return -1;
+
+ mixer = ao_plugin_get_mixer(output->plugin, output->data);
+ if (mixer == NULL)
+ return -1;
+
+ return mixer_get_volume(mixer);
+}
+
int
mixer_all_get_volume(void)
{
@@ -33,8 +56,9 @@ mixer_all_get_volume(void)
int volume, total = 0;
for (unsigned i = 0; i < count; i++) {
- if (mixer_control_getvol(i, &volume)) {
- g_debug("device %d: volume=%d", i, volume);
+ volume = output_mixer_get_volume(i);
+ g_debug("device %d: volume=%d", i, volume);
+ if (volume >= 0) {
total += volume;
++ok;
}
@@ -46,6 +70,38 @@ mixer_all_get_volume(void)
return total / ok;
}
+static bool
+output_mixer_set_volume(unsigned i, int volume, bool relative)
+{
+ struct audio_output *output;
+ struct mixer *mixer;
+
+ assert(i < audio_output_count());
+
+ output = audio_output_get(i);
+ if (!output->enabled)
+ return false;
+
+ mixer = ao_plugin_get_mixer(output->plugin, output->data);
+ if (mixer == NULL)
+ return false;
+
+ if (relative) {
+ int prev = mixer_get_volume(mixer);
+ if (prev < 0)
+ return false;
+
+ volume += prev;
+ }
+
+ if (volume > 100)
+ volume = 100;
+ else if (volume < 0)
+ volume = 0;
+
+ return mixer_set_volume(mixer, volume);
+}
+
bool
mixer_all_set_volume(int volume, bool relative)
{
@@ -53,7 +109,8 @@ mixer_all_set_volume(int volume, bool relative)
unsigned count = audio_output_count();
for (unsigned i = 0; i < count; i++)
- success = mixer_control_setvol(i, volume, relative) || success;
+ success = output_mixer_set_volume(i, volume, relative)
+ || success;
return success;
}