[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v1.0-dev-24-g971bbe0

[Colin Guthrie]

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  1e8b60e3a7c41c754e0eb0aac5807ec6e716e17c (commit)

- Log -----------------------------------------------------------------
971bbe0 module-loopback: Prevent an infinite loop when rate adjusting is disabled
01a853e bluetooth: Fix a2dp processing
37d4566 volume: Trivial cosmetics (remove a space)
-----------------------------------------------------------------------

Summary of changes:
 src/modules/bluetooth/module-bluetooth-device.c |    2 +-
 src/modules/module-loopback.c                   |    3 ++-
 src/pulse/volume.h                              |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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

commit 37d456655fd6758143aeec20def695ca16577555
Author: Colin Guthrie <cguthrie at mandriva.org>
Date:   Mon Dec 6 15:45:22 2010 +0000

    volume: Trivial cosmetics (remove a space)

diff --git a/src/pulse/volume.h b/src/pulse/volume.h
index 35128b6..91eef74 100644
--- a/src/pulse/volume.h
+++ b/src/pulse/volume.h
@@ -127,7 +127,7 @@ typedef uint32_t pa_volume_t;
 /** A structure encapsulating a per-channel volume */
 typedef struct pa_cvolume {
     uint8_t channels;                     /**< Number of channels */
-    pa_volume_t values[PA_CHANNELS_MAX];  /**< Per-channel volume  */
+    pa_volume_t values[PA_CHANNELS_MAX];  /**< Per-channel volume */
 } pa_cvolume;
 
 /** Return non-zero when *a == *b */

commit 01a853e0c0c85a9c41742d7b1427ce7a41cc3162
Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Fri Dec 10 20:34:05 2010 +0100

    bluetooth: Fix a2dp processing

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index c7ac7fa..6d31c1e 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -1529,7 +1529,7 @@ static void thread_func(void *userdata) {
             if (pollfd && (pollfd->revents & POLLIN)) {
                 int n_read;
 
-                if (u->profile == PROFILE_HSP || PROFILE_HFGW)
+                if (u->profile == PROFILE_HSP || u->profile == PROFILE_HFGW)
                     n_read = hsp_process_push(u);
                 else
                     n_read = a2dp_process_push(u);

commit 971bbe04a8adc90818a90d989b9895835da823e5
Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Sat Dec 11 12:05:30 2010 +0100

    module-loopback: Prevent an infinite loop when rate adjusting is disabled

diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
index 0695889..55716b2 100644
--- a/src/modules/module-loopback.c
+++ b/src/modules/module-loopback.c
@@ -501,7 +501,8 @@ static int sink_input_process_msg_cb(pa_msgobject *obj, int code, void *data, in
 
             pa_assert_ctl_context();
 
-            adjust_rates(u);
+            if (u->adjust_time > 0)
+                adjust_rates(u);
             return 0;
         }
     }

-- 
hooks/post-receive
PulseAudio Sound Server