Remove pa_bool_t and replace it with bool.

[pulseaudio] / src / modules / module-position-event-sounds.c

diff --git a/src/modules/module-position-event-sounds.c b/src/modules/module-position-event-sounds.c
index e191ec33c492cda57e6599059f1ead2f922d1abb..bb62cbb938d5f80e7662474abd5a34d2e4290436 100644 (file)
--- a/src/modules/module-position-event-sounds.c
+++ b/src/modules/module-position-event-sounds.c
@@ -24,18 +24,15 @@
 #endif
 
 #include <unistd.h>
-#include <string.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
 #include <pulse/xmalloc.h>
 #include <pulse/volume.h>
 #include <pulse/channelmap.h>
 
-#include <pulsecore/core-error.h>
 #include <pulsecore/module.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/modargs.h>
@@ -47,7 +44,7 @@
 PA_MODULE_AUTHOR("Lennart Poettering");
 PA_MODULE_DESCRIPTION("Position event sounds between L and R depending on the position on screen of the widget triggering them.");
 PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(TRUE);
+PA_MODULE_LOAD_ONCE(true);
 
 static const char* const valid_modargs[] = {
     NULL
@@ -55,37 +52,88 @@ static const char* const valid_modargs[] = {
 
 struct userdata {
     pa_hook_slot *sink_input_fixate_hook_slot;
+    const char *name;
 };
 
+static int parse_pos(const char *pos, double *f) {
+
+    if (pa_atod(pos, f) < 0) {
+        pa_log_warn("Failed to parse hpos/vpos property '%s'.", pos);
+        return -1;
+    }
+
+    if (*f < 0.0 || *f > 1.0) {
+        pa_log_debug("Property hpos/vpos out of range %0.2f", *f);
+
+        *f = PA_CLAMP(*f, 0.0, 1.0);
+    }
+
+    return 0;
+}
+
 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;
+    const char *hpos, *vpos, *role, *id;
     double f;
     char t[PA_CVOLUME_SNPRINT_MAX];
     pa_cvolume v;
 
     pa_assert(data);
 
-    if (!(hpos = pa_proplist_gets(data->proplist, PA_PROP_EVENT_MOUSE_HPOS)))
+    if (!(role = pa_proplist_gets(data->proplist, PA_PROP_MEDIA_ROLE)))
         return PA_HOOK_OK;
 
-    if (pa_atod(hpos, &f) < 0) {
-        pa_log_warn("Failed to parse "PA_PROP_EVENT_MOUSE_HPOS" property '%s'.", hpos);
+    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 triggered 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 (f < 0.0 || f > 1.0) {
-        pa_log_warn("Property "PA_PROP_EVENT_MOUSE_HPOS" out of range %0.2f", f);
+    if (!(hpos = pa_proplist_gets(data->proplist, PA_PROP_EVENT_MOUSE_HPOS)))
+        hpos = pa_proplist_gets(data->proplist, PA_PROP_WINDOW_HPOS);
+
+    if (!(vpos = pa_proplist_gets(data->proplist, PA_PROP_EVENT_MOUSE_VPOS)))
+        vpos = pa_proplist_gets(data->proplist, PA_PROP_WINDOW_VPOS);
+
+    if (!hpos && !vpos)
         return PA_HOOK_OK;
+
+    pa_cvolume_reset(&v, data->sink->sample_spec.channels);
+
+    if (hpos) {
+        if (parse_pos(hpos, &f) < 0)
+            return PA_HOOK_OK;
+
+        if (pa_channel_map_can_balance(&data->sink->channel_map)) {
+            pa_log_debug("Positioning event sound '%s' horizontally at %0.2f.", pa_strnull(pa_proplist_gets(data->proplist, PA_PROP_EVENT_ID)), f);
+            pa_cvolume_set_balance(&v, &data->sink->channel_map, f*2.0-1.0);
+        }
     }
 
-    pa_log_debug("Positioning event sound '%s' at %0.2f.", pa_strnull(pa_proplist_gets(data->proplist, PA_PROP_EVENT_ID)), f);
+    if (vpos) {
+        if (parse_pos(vpos, &f) < 0)
+            return PA_HOOK_OK;
 
-    pa_cvolume_reset(&v, data->sample_spec.channels);
-    pa_cvolume_set_balance(&v, &data->channel_map, f*2.0-1.0);
+        if (pa_channel_map_can_fade(&data->sink->channel_map)) {
+            pa_log_debug("Positioning event sound '%s' vertically at %0.2f.", pa_strnull(pa_proplist_gets(data->proplist, PA_PROP_EVENT_ID)), f);
+            pa_cvolume_set_fade(&v, &data->sink->channel_map, f*2.0-1.0);
+        }
+    }
 
     pa_log_debug("Final volume factor %s.", pa_cvolume_snprint(t, sizeof(t), &v));
-
-    pa_sink_input_new_data_apply_volume_factor(data, &v);
+    pa_sink_input_new_data_add_volume_factor_sink(data, u->name, &v);
 
     return PA_HOOK_OK;
 }
@@ -105,6 +153,7 @@ int pa__init(pa_module*m) {
     u->sink_input_fixate_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_INPUT_FIXATE], PA_HOOK_EARLY, (pa_hook_cb_t) sink_input_fixate_hook_callback, u);
 
     pa_modargs_free(ma);
+    u->name = m->name;
 
     return 0;
 
@@ -114,7 +163,7 @@ fail:
     if (ma)
         pa_modargs_free(ma);
 
-    return  -1;
+    return -1;
 }
 
 void pa__done(pa_module*m) {