[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test5-121-gcab1e54

[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  b6135b34b3d8a9ff04cdf4359d33b54f97823037 (commit)

- Log -----------------------------------------------------------------
cab1e54 explain ff7033c11d9248fe837204b03c8397231dc511fe
ff7033c Revert "make sure we always read in all properties"
29a282a allow nofail mode only when no server string was specified
-----------------------------------------------------------------------

Summary of changes:
 src/modules/bluetooth/bluetooth-util.c |   10 ++--------
 src/pulse/context.c                    |    6 ++++--
 src/pulse/internal.h                   |    4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

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

commit 29a282a41b4f5c3448cc2f6095cde95fc78d2535
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Mar 30 20:31:03 2009 +0000

    allow nofail mode only when no server string was specified

diff --git a/src/pulse/context.c b/src/pulse/context.c
index 13b6d57..28d1719 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -144,7 +144,6 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char *
     if (name)
         pa_proplist_sets(c->proplist, PA_PROP_APPLICATION_NAME, name);
 
-    c->no_fail = FALSE;
     c->system_bus = c->session_bus = NULL;
     c->mainloop = mainloop;
     c->client = NULL;
@@ -170,6 +169,8 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char *
 
     c->do_shm = FALSE;
 
+    c->server_specified = FALSE;
+    c->no_fail = FALSE;
     c->do_autospawn = FALSE;
     memset(&c->spawn_api, 0, sizeof(c->spawn_api));
 
@@ -799,7 +800,7 @@ static int try_next_connection(pa_context *c) {
             }
 #endif
 
-            if (c->no_fail) {
+            if (c->no_fail && !c->server_specified) {
                 if (!c->system_bus)
                     track_pulseaudio_on_dbus(c, DBUS_BUS_SYSTEM, &c->system_bus);
                 if (!c->session_bus)
@@ -917,6 +918,7 @@ int pa_context_connect(
     pa_context_ref(c);
 
     c->no_fail = flags & PA_CONTEXT_NOFAIL;
+    c->server_specified = !!server;
     pa_assert(!c->server_list);
 
     if (server) {
diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index 8c24294..da94faa 100644
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -51,7 +51,6 @@
 struct pa_context {
     PA_REFCNT_DECLARE;
 
-    pa_bool_t no_fail:1;
     pa_dbus_wrap_connection *system_bus;
     pa_dbus_wrap_connection *session_bus;
 
@@ -83,7 +82,8 @@ struct pa_context {
 
     pa_bool_t is_local:1;
     pa_bool_t do_shm:1;
-
+    pa_bool_t server_specified:1;
+    pa_bool_t no_fail:1;
     pa_bool_t do_autospawn:1;
     pa_spawn_api spawn_api;
 

commit ff7033c11d9248fe837204b03c8397231dc511fe
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Mar 31 00:22:17 2009 +0200

    Revert "make sure we always read in all properties"
    
    This reverts commit 1c8f968282208be391f062c1656d85e2ba5078ac.
    
    Turns out doing this is racy. The appropriate fix seems to be
    38825d79123678bf0c5d156aaea4bedb888a7fcd

diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index 78c1bed..02413f4 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -418,15 +418,6 @@ static void found_device(pa_bluetooth_discovery *y, const char* path) {
 
     pa_assert_se(m = dbus_message_new_method_call("org.bluez", path, "org.bluez.Device", "GetProperties"));
     send_and_add_to_pending(y, d, m, get_properties_reply);
-
-    pa_assert_se(m = dbus_message_new_method_call("org.bluez", path, "org.bluez.Audio", "GetProperties"));
-    send_and_add_to_pending(y, d, m, get_properties_reply);
-
-    pa_assert_se(m = dbus_message_new_method_call("org.bluez", path, "org.bluez.Headset", "GetProperties"));
-    send_and_add_to_pending(y, d, m, get_properties_reply);
-
-    pa_assert_se(m = dbus_message_new_method_call("org.bluez", path, "org.bluez.AudioSink", "GetProperties"));
-    send_and_add_to_pending(y, d, m, get_properties_reply);
 }
 
 static void list_devices_reply(DBusPendingCall *pending, void *userdata) {

commit cab1e54392728251bd3b724e42d2b022aa7e7ad2
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Mar 31 00:26:12 2009 +0200

    explain ff7033c11d9248fe837204b03c8397231dc511fe

diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index 02413f4..6e4344f 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -418,6 +418,9 @@ static void found_device(pa_bluetooth_discovery *y, const char* path) {
 
     pa_assert_se(m = dbus_message_new_method_call("org.bluez", path, "org.bluez.Device", "GetProperties"));
     send_and_add_to_pending(y, d, m, get_properties_reply);
+
+    /* Before we read the other properties (Audio, AudioSink, Headset) we wait
+     * that the UUID is read */
 }
 
 static void list_devices_reply(DBusPendingCall *pending, void *userdata) {

-- 
hooks/post-receive
PulseAudio Sound Server