remove soft volume from pa_sink_input_new_info since it should be handled internally...

[pulseaudio] / src / pulsecore / queue.c

diff --git a/src/pulsecore/queue.c b/src/pulsecore/queue.c
index b095481a58387cc7bcbe0bc67d990756e5737fdc..2c73a3db7daa49ac9a205bf2fc78cf6374be222d 100644 (file)
--- a/src/pulsecore/queue.c
+++ b/src/pulsecore/queue.c
@@ -1,9 +1,7 @@
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
 
-  Copyright 2004-2006 Lennart Poettering
+  Copyright 2004-2008 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
@@ -47,34 +45,37 @@ struct pa_queue {
 
 pa_queue* pa_queue_new(void) {
     pa_queue *q = pa_xnew(pa_queue, 1);
-    
+
     q->front = q->back = NULL;
     q->length = 0;
-    
+
     return q;
 }
 
-void pa_queue_free(pa_queue* q, void (*destroy)(void *p, void *userdata), void *userdata) {
+void pa_queue_free(pa_queue* q, pa_free2_cb_t free_func, void *userdata) {
     void *data;
     pa_assert(q);
 
     while ((data = pa_queue_pop(q)))
-        if (destroy)
-            destroy(data, userdata);
+        if (free_func)
+            free_func(data, userdata);
 
     pa_assert(!q->front);
     pa_assert(!q->back);
     pa_assert(q->length == 0);
-    
+
     pa_xfree(q);
 }
 
 void pa_queue_push(pa_queue *q, void *p) {
     struct queue_entry *e;
 
+    pa_assert(q);
+    pa_assert(p);
+
     if (!(e = pa_flist_pop(PA_STATIC_FLIST_GET(entries))))
         e = pa_xnew(struct queue_entry, 1);
-    
+
     e->data = p;
     e->next = NULL;
 
@@ -93,6 +94,7 @@ void pa_queue_push(pa_queue *q, void *p) {
 void* pa_queue_pop(pa_queue *q) {
     void *p;
     struct queue_entry *e;
+
     pa_assert(q);
 
     if (!(e = q->front))
@@ -109,14 +111,14 @@ void* pa_queue_pop(pa_queue *q) {
 
     if (pa_flist_push(PA_STATIC_FLIST_GET(entries), e) < 0)
         pa_xfree(e);
-    
+
     q->length--;
 
     return p;
 }
 
-int pa_queue_is_empty(pa_queue *q) {
+int pa_queue_isempty(pa_queue *q) {
     pa_assert(q);
-    
+
     return q->length == 0;
 }