[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-4-gb3592a1

Lennart Poettering gitmailer-noreply at 0pointer.de
Tue Oct 6 14:34:31 PDT 2009


This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  c96d2d1117a7e59b351358c8cdd79ef465ddbd49 (commit)

- Log -----------------------------------------------------------------
b3592a1 position-event-sounds: never position test sounds in space
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-position-event-sounds.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------

commit b3592a160f0d2a28605048a81c0261bf7c45acbb
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Oct 6 23:34:22 2009 +0200

    position-event-sounds: never position test sounds in space

diff --git a/src/modules/module-position-event-sounds.c b/src/modules/module-position-event-sounds.c
index 7221b14..ee4c8c8 100644
--- a/src/modules/module-position-event-sounds.c
+++ b/src/modules/module-position-event-sounds.c
@@ -74,7 +74,7 @@ static int parse_pos(const char *pos, double *f) {
 }
 
 static pa_hook_result_t sink_input_fixate_hook_callback(pa_core *core, pa_sink_input_new_data *data, struct userdata *u) {
-    const char *hpos, *vpos, *role;
+    const char *hpos, *vpos, *role, *id;
     double f;
     char t[PA_CVOLUME_SNPRINT_MAX];
     pa_cvolume v;
@@ -87,6 +87,22 @@ static pa_hook_result_t sink_input_fixate_hook_callback(pa_core *core, pa_sink_i
     if (!pa_streq(role, "event"))
         return PA_HOOK_OK;
 
+    if ((id = pa_proplist_gets(data->proplist, PA_PROP_EVENT_ID))) {
+
+        /* The test sounds should never be positioned in space, since
+         * they might be trigered themselves to configure the speakers
+         * in space, which we don't want to mess up. */
+
+        if (pa_startswith(id, "audio-channel-"))
+            return PA_HOOK_OK;
+
+        if (pa_streq(id, "audio-volume-change"))
+            return PA_HOOK_OK;
+
+        if (pa_streq(id, "audio-test-signal"))
+            return PA_HOOK_OK;
+    }
+
     if (!(hpos = pa_proplist_gets(data->proplist, PA_PROP_EVENT_MOUSE_HPOS)))
         hpos = pa_proplist_gets(data->proplist, PA_PROP_WINDOW_HPOS);
 

-- 
hooks/post-receive
PulseAudio Sound Server



More information about the pulseaudio-commits mailing list