[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, patches, updated. upstream/0.9.13-5-g94958bb

[sjoerd at users.alioth.debian.org]

The branch, patches has been updated
       via  94958bb7c690f7bc4c3dd2a2b87ffa567929e9da (commit)
       via  3ab1e82495c8aca71b99d36d5ef41af395c78330 (commit)
       via  b47ce0f5c3a5c23c674b46e5608b88a67e70da73 (commit)
      from  121bfc9f1916395e5216927ec3a9e0bbd742395a (commit)


- Shortlog ------------------------------------------------------------
94958bb Fix two typos that broke tunnels
3ab1e82 properly remove dbus matches an filters when unloading m-b-d
b47ce0f make sure to use 64bit rounding even on 32bit machines when converting to pa_usec_t

Summary of changes:
 src/modules/bluetooth/module-bluetooth-discover.c |   17 ++++++++++++++++-
 src/modules/module-tunnel.c                       |    4 ++--
 src/pulsecore/time-smoother.c                     |    6 +++---
 3 files changed, 21 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 94958bb7c690f7bc4c3dd2a2b87ffa567929e9da
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Sat Oct 11 18:20:06 2008 +0100

    Fix two typos that broke tunnels
    
    Signed-off-by: Lennart Poettering <lennart at poettering.net>

diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index 4bbb11a..a46d6e5 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -508,7 +508,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
 
     switch (code) {
 
-        case PA_SINK_MESSAGE_SET_STATE: {
+        case PA_SOURCE_MESSAGE_SET_STATE: {
             int r;
 
             if ((r = pa_source_process_msg(o, code, data, offset, chunk)) >= 0)
@@ -520,7 +520,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
         case PA_SOURCE_MESSAGE_GET_LATENCY: {
             pa_usec_t yr, yl, *usec = data;
 
-            yl = pa_bytes_to_usec((uint64_t) u->counter, &PA_SINK(o)->sample_spec);
+            yl = pa_bytes_to_usec((uint64_t) u->counter, &PA_SOURCE(o)->sample_spec);
             yr = pa_smoother_get(u->smoother, pa_rtclock_usec());
 
             *usec = yr > yl ? yr - yl : 0;

commit 3ab1e82495c8aca71b99d36d5ef41af395c78330
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Oct 13 19:52:02 2008 +0200

    properly remove dbus matches an filters when unloading m-b-d

diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 0601e9a..9d14c1a 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -452,8 +452,23 @@ void pa__done(pa_module* m) {
         device_free(i);
     }
 
-    if (u->conn)
+    if (u->conn) {
+        DBusError error;
+        dbus_error_init(&error);
+
+        dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Adapter',member='DeviceRemoved'", &error);
+        dbus_error_free(&error);
+
+        dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Headset',member='PropertyChanged'", &error);
+        dbus_error_free(&error);
+
+        dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.AudioSink',member='PropertyChanged'", &error);
+        dbus_error_free(&error);
+
+        dbus_connection_remove_filter(pa_dbus_connection_get(u->conn), filter_cb, u);
+
         pa_dbus_connection_unref(u->conn);
+    }
 
     pa_xfree(u);
 }

commit b47ce0f5c3a5c23c674b46e5608b88a67e70da73
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Oct 24 04:34:10 2008 +0200

    make sure to use 64bit rounding even on 32bit machines when converting to pa_usec_t

diff --git a/src/pulsecore/time-smoother.c b/src/pulsecore/time-smoother.c
index 6a2ffaa..6562194 100644
--- a/src/pulsecore/time-smoother.c
+++ b/src/pulsecore/time-smoother.c
@@ -313,7 +313,7 @@ static void estimate(pa_smoother *s, pa_usec_t x, pa_usec_t *y, double *deriv) {
         /* Move back from origin */
         ty += (double) s->ey;
 
-        *y = ty >= 0 ? (pa_usec_t) lrint(ty) : 0;
+        *y = ty >= 0 ? (pa_usec_t) llrint(ty) : 0;
 
         /* Horner scheme */
         if (deriv)
@@ -360,7 +360,7 @@ void pa_smoother_put(pa_smoother *s, pa_usec_t x, pa_usec_t y) {
 
     /* And calculate when we want to be on track again */
     s->px = s->ex + s->adjust_time;
-    s->py = s->ry + (pa_usec_t) lrint(s->dp * (double) s->adjust_time);
+    s->py = s->ry + (pa_usec_t) llrint(s->dp * (double) s->adjust_time);
 
     s->abc_valid = FALSE;
 
@@ -456,7 +456,7 @@ pa_usec_t pa_smoother_translate(pa_smoother *s, pa_usec_t x, pa_usec_t y_delay)
 
 /*     pa_log_debug("translate(%llu) = %llu (%0.2f)", (unsigned long long) y_delay, (unsigned long long) ((double) y_delay / nde), nde); */
 
-    return (pa_usec_t) lrint((double) y_delay / nde);
+    return (pa_usec_t) llrint((double) y_delay / nde);
 }
 
 void pa_smoother_reset(pa_smoother *s) {

-- 
pulseaudio packaging