output/pulse: call mixer on state changes

Don't let the mixer plugin "override" the libpulse callbacks.
Instead, add a "mixer" attribute to the pulse_output struct, and call
the mixer on all interesting events.

1 files changed, 16 insertions, 2 deletions

diff --git a/test/read_mixer.c b/test/read_mixer.c
index 1bf40bd5b..0272ec67a 100644
--- a/test/read_mixer.c
+++ b/test/read_mixer.c
@@ -31,12 +31,26 @@
 #include <unistd.h>
 
 void
-pulse_output_context_state_cb(G_GNUC_UNUSED struct pa_context *context,
-			      G_GNUC_UNUSED void *userdata)
+pulse_output_set_mixer(G_GNUC_UNUSED struct pulse_output *po,
+		       G_GNUC_UNUSED struct pulse_mixer *pm)
 {
 }
 
 void
+pulse_output_clear_mixer(G_GNUC_UNUSED struct pulse_output *po,
+			 G_GNUC_UNUSED struct pulse_mixer *pm)
+{
+}
+
+bool
+pulse_output_set_volume(G_GNUC_UNUSED struct pulse_output *po,
+			G_GNUC_UNUSED const struct pa_cvolume *volume,
+			G_GNUC_UNUSED GError **error_r)
+{
+	return false;
+}
+
+void
 event_pipe_emit(G_GNUC_UNUSED enum pipe_event event)
 {
 }