Merge remote branch 'mkbosmans/rate-adjustment'

[pulseaudio] / src / pulsecore / hook-list.c

diff --git a/src/pulsecore/hook-list.c b/src/pulsecore/hook-list.c
index 3a6874c47cf5375d8d99f42a49a6e5dbb52471d2..d9b9917d40f9916efa674dd21a688da30792caa3 100644 (file)
--- a/src/pulsecore/hook-list.c
+++ b/src/pulsecore/hook-list.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-

 /***
   This file is part of PulseAudio.
 
 /***
   This file is part of PulseAudio.
 


@@ -7,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
 
   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
+  published 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
   License, or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -33,8 +31,7 @@ void pa_hook_init(pa_hook *hook, void *data) {
     pa_assert(hook);
 
     PA_LLIST_HEAD_INIT(pa_hook_slot, hook->slots);
     pa_assert(hook);
 
     PA_LLIST_HEAD_INIT(pa_hook_slot, hook->slots);

-    hook->last = NULL;
-    hook->n_dead = hook->firing = 0;
+    hook->n_dead = hook->n_firing = 0;

     hook->data = data;
 }
 
     hook->data = data;
 }
 


@@ -42,17 +39,14 @@ static void slot_free(pa_hook *hook, pa_hook_slot *slot) {
     pa_assert(hook);
     pa_assert(slot);
 
     pa_assert(hook);
     pa_assert(slot);
 

-    if (hook->last == slot)
-        hook->last = slot->prev;
-

     PA_LLIST_REMOVE(pa_hook_slot, hook->slots, slot);
 
     pa_xfree(slot);
 }
 
     PA_LLIST_REMOVE(pa_hook_slot, hook->slots, slot);
 
     pa_xfree(slot);
 }
 

-void pa_hook_free(pa_hook *hook) {
+void pa_hook_done(pa_hook *hook) {

     pa_assert(hook);
     pa_assert(hook);

-    pa_assert(!hook->firing);
+    pa_assert(hook->n_firing == 0);

 
     while (hook->slots)
         slot_free(hook, hook->slots);
 
     while (hook->slots)
         slot_free(hook, hook->slots);


@@ -60,19 +54,26 @@ void pa_hook_free(pa_hook *hook) {
     pa_hook_init(hook, NULL);
 }
 
     pa_hook_init(hook, NULL);
 }
 

-pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_cb_t cb, void *data) {
-    pa_hook_slot *slot;
+pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_priority_t prio, pa_hook_cb_t cb, void *data) {
+    pa_hook_slot *slot, *where, *prev;

 
     pa_assert(cb);
 
     slot = pa_xnew(pa_hook_slot, 1);
     slot->hook = hook;
 
     pa_assert(cb);
 
     slot = pa_xnew(pa_hook_slot, 1);
     slot->hook = hook;

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

     slot->callback = cb;
     slot->data = data;
     slot->callback = cb;
     slot->data = data;

+    slot->priority = prio;
+
+    prev = NULL;
+    for (where = hook->slots; where; where = where->next) {
+        if (prio < where->priority)
+            break;
+        prev = where;
+    }

 
 

-    PA_LLIST_INSERT_AFTER(pa_hook_slot, hook->slots, hook->last, slot);
-    hook->last = slot;
+    PA_LLIST_INSERT_AFTER(pa_hook_slot, hook->slots, prev, slot);

 
     return slot;
 }
 
     return slot;
 }


@@ -81,8 +82,8 @@ void pa_hook_slot_free(pa_hook_slot *slot) {
     pa_assert(slot);
     pa_assert(!slot->dead);
 
     pa_assert(slot);
     pa_assert(!slot->dead);
 

-    if (slot->hook->firing > 0) {
-        slot->dead = 1;
+    if (slot->hook->n_firing > 0) {
+        slot->dead = TRUE;

         slot->hook->n_dead++;
     } else
         slot_free(slot->hook, slot);
         slot->hook->n_dead++;
     } else
         slot_free(slot->hook, slot);


@@ -94,9 +95,9 @@ pa_hook_result_t pa_hook_fire(pa_hook *hook, void *data) {
 
     pa_assert(hook);
 
 
     pa_assert(hook);
 

-    hook->firing ++;
+    hook->n_firing ++;

 
 

-    for (slot = hook->slots; slot; slot = slot->next) {
+    PA_LLIST_FOREACH(slot, hook->slots) {

         if (slot->dead)
             continue;
 
         if (slot->dead)
             continue;
 


@@ -104,7 +105,8 @@ pa_hook_result_t pa_hook_fire(pa_hook *hook, void *data) {
             break;
     }
 
             break;
     }
 

-    hook->firing --;
+    hook->n_firing --;
+    pa_assert(hook->n_firing >= 0);

 
     for (slot = hook->slots; hook->n_dead > 0 && slot; slot = next) {
         next = slot->next;
 
     for (slot = hook->slots; hook->n_dead > 0 && slot; slot = next) {
         next = slot->next;


@@ -115,6 +117,13 @@ pa_hook_result_t pa_hook_fire(pa_hook *hook, void *data) {
         }
     }
 
         }
     }
 

+    pa_assert(hook->n_dead == 0);
+

     return result;
 }
 
     return result;
 }
 

+pa_bool_t pa_hook_is_firing(pa_hook *hook) {
+    pa_assert(hook);
+
+    return hook->n_firing > 0;
+}