[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.16-test1-33-g95d3faa

[Lennart Poettering]

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  7dabe051cdd3980887a78a6cfe8e06666e2b21c9 (commit)

- Log -----------------------------------------------------------------
95d3faa bluetooth: don't connect on unconnected profile
e93c6c3 bluetooth: warn on EAGAIN after POLLOUT
-----------------------------------------------------------------------

Summary of changes:
 src/modules/bluetooth/module-bluetooth-device.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

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

commit e93c6c36fe3bb6961be7c868627b99cafc015ca2
Author: Marc-André Lureau <marc-andre.lureau at nokia.com>
Date:   Wed Jul 1 13:11:33 2009 +0300

    bluetooth: warn on EAGAIN after POLLOUT

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index c46518e..f7dbfd9 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -1351,6 +1351,9 @@ static void thread_func(void *userdata) {
                             goto fail;
                     }
 
+                    if (n_written == 0)
+                        pa_log("Broken kernel: we got EAGAIN on write() after POLLOUT!");
+
                     do_write -= n_written;
                     writable = FALSE;
                 }

commit 95d3faaac8038116d8008477dcf1034a25ab30a0
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Mon Jun 29 17:46:30 2009 +0300

    bluetooth: don't connect on unconnected profile

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index f7dbfd9..0560ef3 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -2086,6 +2086,15 @@ static int add_card(struct userdata *u, const pa_bluetooth_device *device) {
     u->card->set_profile = card_set_profile;
 
     d = PA_CARD_PROFILE_DATA(u->card->active_profile);
+
+    if ((device->headset_state < PA_BT_AUDIO_STATE_CONNECTED && *d == PROFILE_HSP) ||
+        (device->audio_sink_state < PA_BT_AUDIO_STATE_CONNECTED && *d == PROFILE_A2DP)) {
+        pa_log_warn("Default profile not connected, selecting off profile");
+        u->card->active_profile = pa_hashmap_get(u->card->profiles, "off");
+        u->card->save_profile = FALSE;
+    }
+
+    d = PA_CARD_PROFILE_DATA(u->card->active_profile);
     u->profile = *d;
 
     return 0;

-- 
hooks/post-receive
PulseAudio Sound Server