[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.11-124-g46f0f9e

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

- Log -----------------------------------------------------------------
46f0f9e... a few modernizations
e65c514... don't unref pa_native_options object twice
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-native-protocol-fd.c |   13 ++++++-------
 src/pulsecore/core-subscribe.c          |   12 ++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

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

commit e65c514542d5eee842fde9eb1eb6186c9f37c45b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Aug 18 20:07:32 2008 +0200

    don't unref pa_native_options object twice

diff --git a/src/modules/module-native-protocol-fd.c b/src/modules/module-native-protocol-fd.c
index fa9c0e4..f17f435 100644
--- a/src/modules/module-native-protocol-fd.c
+++ b/src/modules/module-native-protocol-fd.c
@@ -48,7 +48,8 @@ static const char* const valid_modargs[] = {
 int pa__init(pa_module*m) {
     pa_iochannel *io;
     pa_modargs *ma;
-    int fd, r = -1;
+    int32_t fd;
+    int r = -1;
     pa_native_options *options = NULL;
 
     pa_assert(m);
@@ -63,18 +64,16 @@ int pa__init(pa_module*m) {
         goto finish;
     }
 
-    options = pa_native_options_new();
-    options->module = m;
-    options->auth_anonymous = TRUE;
+    m->userdata = pa_native_protocol_get(m->core);
 
     io = pa_iochannel_new(m->core->mainloop, fd, fd);
 
-    m->userdata = pa_native_protocol_get(m->core);
+    options = pa_native_options_new();
+    options->module = m;
+    options->auth_anonymous = TRUE;
 
     pa_native_protocol_connect(m->userdata, io, options);
 
-    pa_native_options_unref(options);
-
     r = 0;
 
 finish:

commit 46f0f9ed8bb2cda7c1f19b5d900e2954d7aa1f27
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Aug 18 20:07:57 2008 +0200

    a few modernizations

diff --git a/src/pulsecore/core-subscribe.c b/src/pulsecore/core-subscribe.c
index 6107002..c70d8ad 100644
--- a/src/pulsecore/core-subscribe.c
+++ b/src/pulsecore/core-subscribe.c
@@ -42,7 +42,7 @@
 
 struct pa_subscription {
     pa_core *core;
-    int dead;
+    pa_bool_t dead;
 
     pa_subscription_cb_t callback;
     void *userdata;
@@ -72,7 +72,7 @@ pa_subscription* pa_subscription_new(pa_core *c, pa_subscription_mask_t m, pa_su
 
     s = pa_xnew(pa_subscription, 1);
     s->core = c;
-    s->dead = 0;
+    s->dead = FALSE;
     s->callback = callback;
     s->userdata = userdata;
     s->mask = m;
@@ -86,7 +86,7 @@ void pa_subscription_free(pa_subscription*s) {
     pa_assert(s);
     pa_assert(!s->dead);
 
-    s->dead = 1;
+    s->dead = TRUE;
     sched_event(s->core);
 }
 
@@ -145,7 +145,7 @@ static void dump_event(const char * prefix, pa_subscription_event*e) {
         [PA_SUBSCRIPTION_EVENT_REMOVE] = "REMOVE"
     };
 
-    pa_log("%s event (%s|%s|%u)",
+    pa_log_debug("%s event (%s|%s|%u)",
            prefix,
            fac_table[e->type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK],
            type_table[e->type & PA_SUBSCRIPTION_EVENT_TYPE_MASK],
@@ -234,7 +234,7 @@ void pa_subscription_post(pa_core *c, pa_subscription_event_type_t t, uint32_t i
                  * entry in the queue. */
 
                 free_event(i);
-                pa_log_debug("dropped redundant event.");
+                pa_log_debug("Dropped redundant event due to remove event.");
                 continue;
             }
 
@@ -242,7 +242,7 @@ void pa_subscription_post(pa_core *c, pa_subscription_event_type_t t, uint32_t i
                 /* This object has changed. If a "new" or "change" event for
                  * this object is still in the queue we can exit. */
 
-                pa_log_debug("dropped redundant event.");
+                pa_log_debug("Dropped redundant event due to change event.");
                 return;
             }
         }

-- 
hooks/post-receive
PulseAudio Sound Server