sndfile: big rework of libsndfile interfacing code

[pulseaudio] / src / pulsecore / core-subscribe.c

diff --git a/src/pulsecore/core-subscribe.c b/src/pulsecore/core-subscribe.c
index 6107002bcd537ea67f97f1ddbb9cd9b1eef99311..54fb7ec2326943cebc4fea52221a480a092fa62e 100644 (file)
--- a/src/pulsecore/core-subscribe.c
+++ b/src/pulsecore/core-subscribe.c
@@ -5,7 +5,7 @@
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published

-  by the Free Software Foundation; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,

   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -42,7 +42,7 @@
 
 struct pa_subscription {
     pa_core *core;
 
 struct pa_subscription {
     pa_core *core;

-    int dead;
+    pa_bool_t dead;

 
     pa_subscription_cb_t callback;
     void *userdata;
 
     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 = pa_xnew(pa_subscription, 1);
     s->core = c;

-    s->dead = 0;
+    s->dead = FALSE;

     s->callback = callback;
     s->userdata = userdata;
     s->mask = m;
     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);
 
     pa_assert(s);
     pa_assert(!s->dead);
 

-    s->dead = 1;
+    s->dead = TRUE;

     sched_event(s->core);
 }
 
     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_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],
            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);
                  * entry in the queue. */
 
                 free_event(i);

-                pa_log_debug("dropped redundant event.");
+                pa_log_debug("Dropped redundant event due to remove event.");

                 continue;
             }
 
                 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. */
 
                 /* 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;
             }
         }
                 return;
             }
         }