Make tests compile on FreeBSD

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

diff --git a/src/pulsecore/hook-list.h b/src/pulsecore/hook-list.h
index 67e5d1ae2ca49c62b7931d5b4ccffa648de8fdc3..deaa1715948d94f8577e4675945bddb9d23cae8d 100644 (file)
--- a/src/pulsecore/hook-list.h
+++ b/src/pulsecore/hook-list.h
@@ -1,21 +1,21 @@
 #ifndef foohooklistfoo
 #define foohooklistfoo
 
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
- 
+
+  Copyright 2006 Lennart Poettering
+
   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
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -23,8 +23,6 @@
 ***/
 
 #include <pulsecore/llist.h>
-#include <pulse/xmalloc.h>
-#include <pulsecore/gccmacro.h>
 
 typedef struct pa_hook_slot pa_hook_slot;
 typedef struct pa_hook pa_hook;
@@ -35,14 +33,21 @@ typedef enum pa_hook_result {
     PA_HOOK_CANCEL = -1
 } pa_hook_result_t;
 
+typedef enum pa_hook_priority {
+    PA_HOOK_EARLY = -100,
+    PA_HOOK_NORMAL = 0,
+    PA_HOOK_LATE = 100
+} pa_hook_priority_t;
+
 typedef pa_hook_result_t (*pa_hook_cb_t)(
         void *hook_data,
         void *call_data,
         void *slot_data);
 
 struct pa_hook_slot {
-    int dead;
+    bool dead;
     pa_hook *hook;
+    pa_hook_priority_t priority;
     pa_hook_cb_t callback;
     void *data;
     PA_LLIST_FIELDS(pa_hook_slot);
@@ -50,18 +55,19 @@ struct pa_hook_slot {
 
 struct pa_hook {
     PA_LLIST_HEAD(pa_hook_slot, slots);
-    pa_hook_slot *last;
-    int firing, n_dead;
+    int n_firing, n_dead;
 
     void *data;
 };
 
 void pa_hook_init(pa_hook *hook, void *data);
-void pa_hook_free(pa_hook *hook);
+void pa_hook_done(pa_hook *hook);
 
-pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_cb_t, void *data);
+pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_priority_t prio, pa_hook_cb_t cb, void *data);
 void pa_hook_slot_free(pa_hook_slot *slot);
 
 pa_hook_result_t pa_hook_fire(pa_hook *hook, void *data);
 
+bool pa_hook_is_firing(pa_hook *hook);
+
 #endif