[Musicpd-dev-team] [PATCH] pulse mixer
This patch introduces the mixer for the pulse output.
Technically speaking, the pulse index is needed to get or set
the volume. You must define callback fonctions to get this index since
the pulse output in mpd is done using the simpe api. The pulse simple api
does not provide the index of the newly defined output.
So callback fonctions are associated to the pulse context.
The list of all the sink input is then retreived.
Then we select the name of the mpd pulse output and control
its volume by its associated index number.
Signed-off-by: Patrice Linel patnathan...@gmail.com
Signed-off-by: David Guibert david.guib...@gmail.com
---
Makefile.am |1 +
src/main.c|3 +-
src/mixer/pulse_mixer.c | 284 +
src/mixer_api.h |1 +
src/output/pulse_plugin.c | 16 +++
5 files changed, 303 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 25478f8..2511680 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -489,6 +489,7 @@ endif
if HAVE_PULSE
OUTPUT_SRC += src/output/pulse_plugin.c
+MIXER_SRC += src/mixer/pulse_mixer.c
endif
if HAVE_SHOUT
diff --git a/src/main.c b/src/main.c
index a3f613d..2889933 100644
--- a/src/main.c
+++ b/src/main.c
@@ -259,6 +259,7 @@ int main(int argc, char *argv[])
command_init();
initialize_decoder_and_player();
+ daemonize(options.daemon);
volume_init();
initAudioConfig();
audio_output_all_init();
@@ -267,8 +268,6 @@ int main(int argc, char *argv[])
initNormalization();
input_stream_global_init();
- daemonize(options.daemon);
-
setup_log_output(options.stdOutput);
initSigHandlers();
diff --git a/src/mixer/pulse_mixer.c b/src/mixer/pulse_mixer.c
new file mode 100644
index 000..78b77c0
--- /dev/null
+++ b/src/mixer/pulse_mixer.c
@@ -0,0 +1,284 @@
+#include ../output_api.h
+#include ../mixer_api.h
+
+#include glib.h
+#include pulse/volume.h
+#include pulse/pulseaudio.h
+
+struct pulse_mixer {
+ struct mixer base;
+ char *server;
+ char *sink;
+ char *output_name;
+ uint32_t index;
+ boolonline;
+ struct pa_context *context;
+ struct pa_threaded_mainloop *mainloop;
+ struct pa_cvolume *volume;
+
+};
+
+
+
+static void sink_input_cb(G_GNUC_UNUSED pa_context *context, const
pa_sink_input_info *i, int eol, void *userdata)
+{
+
+ struct pulse_mixer *pm = userdata;
+ if (eol) {
+ g_debug(eol error sink_input_cb\n);
+ return;
+ }
+
+ if (!i) {
+ g_debug(Sink input callback failure\n);
+ return;
+ }
+ g_debug(sink input cb %s, index %d \n,i-name,i-index);
+ if(strcmp(i-name,pm-output_name)==0)
+ {
+ pm-index=i-index;
+ pm-online=true;
+ *pm-volume=i-volume;
+ }
+ else g_debug(bad name\n);
+}
+
+static void sink_input_vol(G_GNUC_UNUSED pa_context *context, const
pa_sink_input_info *i, int eol, void *userdata)
+{
+
+ struct pulse_mixer *pm = userdata;
+ if (eol) {
+ g_debug(eol error sink_input_vol\n);
+ return;
+ }
+
+ if (!i) {
+ g_debug(Sink input callback failure\n);
+ return;
+ }
+ g_debug(sink input vol %s, index %d \n,i-name,i-index);
+ *pm-volume=i-volume;
+}
+
+static void
+subscribe_cb(G_GNUC_UNUSED pa_context *c, pa_subscription_event_type_t t,
uint32_t idx, void *userdata)
+{
+
+ struct pulse_mixer *pm = userdata;
+ g_debug(pulse_mixer: subscribe call back\n);
+ switch (t PA_SUBSCRIPTION_EVENT_FACILITY_MASK)
+ {
+
+ case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
+ if ((t PA_SUBSCRIPTION_EVENT_TYPE_MASK) ==
+ PA_SUBSCRIPTION_EVENT_REMOVE)
+ pm-online =false;
+ else
+ {
+ pa_operation *o;
+
+ if (!(o =
pa_context_get_sink_input_info(pm-context, idx, sink_input_cb, pm)))
+ {
+ g_debug(pulse_mixer:
pa_context_get_sink_input_info() failed\n);
+ return;
+ }
+ pa_operation_unref(o);
+ }
+ break;
+ }
+}
+
+static void
+context_state_cb(pa_context *context, void *userdata)
+{
+ struct pulse_mixer *pm = userdata;
+ switch (pa_context_get_state(context))
+ {
+ case PA_CONTEXT_READY:
+ {
+ pa_operation *o;
+
+ pa_context_set_subscribe_callback(context,
subscribe_cb, pm);
+
+ if (!(o = pa_context_subscribe(context,
[Musicpd-dev-team] [PATCH] pulse mixer
Sorry. I forgot to do the make after minor changes... I resend the patch wich compiles cleanly. -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH] pulse mixer
This patch introduces the mixer for the pulse output.
Technically speaking, the pulse index is needed to get or set
the volume. You must define callback fonctions to get this index since
the pulse output in mpd is done using the simpe api. The pulse simple api
does not provide the index of the newly defined output.
So callback fonctions are associated to the pulse context.
The list of all the sink input is then retreived.
Then we select the name of the mpd pulse output and control
its volume by its associated index number.
Signed-off-by: Patrice Linel patnathan...@gmail.com
Signed-off-by: David Guibert david.guib...@gmail.com
---
Makefile.am |1 +
src/main.c|3 +-
src/mixer/pulse_mixer.c | 284 +
src/mixer_api.h |1 +
src/output/pulse_plugin.c | 16 +++
5 files changed, 303 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 25478f8..2511680 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -489,6 +489,7 @@ endif
if HAVE_PULSE
OUTPUT_SRC += src/output/pulse_plugin.c
+MIXER_SRC += src/mixer/pulse_mixer.c
endif
if HAVE_SHOUT
diff --git a/src/main.c b/src/main.c
index a3f613d..2889933 100644
--- a/src/main.c
+++ b/src/main.c
@@ -259,6 +259,7 @@ int main(int argc, char *argv[])
command_init();
initialize_decoder_and_player();
+ daemonize(options.daemon);
volume_init();
initAudioConfig();
audio_output_all_init();
@@ -267,8 +268,6 @@ int main(int argc, char *argv[])
initNormalization();
input_stream_global_init();
- daemonize(options.daemon);
-
setup_log_output(options.stdOutput);
initSigHandlers();
diff --git a/src/mixer/pulse_mixer.c b/src/mixer/pulse_mixer.c
new file mode 100644
index 000..e12a844
--- /dev/null
+++ b/src/mixer/pulse_mixer.c
@@ -0,0 +1,284 @@
+#include ../output_api.h
+#include ../mixer_api.h
+
+#include glib.h
+#include pulse/volume.h
+#include pulse/pulseaudio.h
+
+struct pulse_mixer {
+ struct mixer base;
+ char *server;
+ char *sink;
+ char *output_name;
+ uint32_t index;
+ boolonline;
+ struct pa_context *context;
+ struct pa_threaded_mainloop *mainloop;
+ struct pa_cvolume *volume;
+
+};
+
+
+
+static void sink_input_cb(G_GNUC_UNUSED pa_context *context, const
pa_sink_input_info *i, int eol, void *userdata)
+{
+
+ struct pulse_mixer *pm = userdata;
+ if (eol) {
+ g_debug(eol error sink_input_cb\n);
+ return;
+ }
+
+ if (!i) {
+ g_debug(Sink input callback failure\n);
+ return;
+ }
+ g_debug(sink input cb %s, index %d \n,i-name,i-index);
+ if(strcmp(i-name,pm-output_name)==0)
+ {
+ pm-index=i-index;
+ pm-online=true;
+ *pm-volume=i-volume;
+ }
+ else g_debug(bad name\n);
+}
+
+static void sink_input_vol(G_GNUC_UNUSED pa_context *context, const
pa_sink_input_info *i, int eol, void *userdata)
+{
+
+ struct pulse_mixer *pm = userdata;
+ if (eol) {
+ g_debug(eol error sink_input_vol\n);
+ return;
+ }
+
+ if (!i) {
+ g_debug(Sink input callback failure\n);
+ return;
+ }
+ g_debug(sink input vol %s, index %d \n,i-name,i-index);
+ *pm-volume=i-volume;
+}
+
+static void
+subscribe_cb(G_GNUC_UNUSED pa_context *c, pa_subscription_event_type_t t,
uint32_t idx, void *userdata)
+{
+
+ struct pulse_mixer *pm = userdata;
+ g_debug(pulse_mixer: subscribe call back\n);
+ switch (t PA_SUBSCRIPTION_EVENT_FACILITY_MASK)
+ {
+
+ case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
+ if ((t PA_SUBSCRIPTION_EVENT_TYPE_MASK) ==
+ PA_SUBSCRIPTION_EVENT_REMOVE)
+ pm-online =false;
+ else
+ {
+ pa_operation *o;
+
+ if (!(o =
pa_context_get_sink_input_info(pm-context, idx, sink_input_cb, pm)))
+ {
+ g_debug(pulse_mixer:
pa_context_get_sink_input_info() failed\n);
+ return;
+ }
+ pa_operation_unref(o);
+ }
+ break;
+ }
+}
+
+static void
+context_state_cb(pa_context *context, void *userdata)
+{
+ struct pulse_mixer *pm = userdata;
+ switch (pa_context_get_state(context))
+ {
+ case PA_CONTEXT_READY:
+ {
+ pa_operation *o;
+
+ pa_context_set_subscribe_callback(context,
subscribe_cb, pm);
+
+ if (!(o = pa_context_subscribe(context,
