return p;
}
-static void item_free(void *item, void *q) {
+static void item_free(void *item) {
struct item_info *i = item;
pa_assert(i);
pa_pstream_unlink(p);
- pa_queue_free(p->send_queue, item_free, NULL);
+ pa_queue_free(p->send_queue, item_free);
if (p->write.current)
- item_free(p->write.current, NULL);
+ item_free(p->write.current);
if (p->write.memchunk.memblock)
pa_memblock_unref(p->write.memchunk.memblock);
if (p->write.index >= PA_PSTREAM_DESCRIPTOR_SIZE + ntohl(p->write.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH])) {
pa_assert(p->write.current);
- item_free(p->write.current, NULL);
+ item_free(p->write.current);
p->write.current = NULL;
if (p->write.memchunk.memblock)
return q;
}
-void pa_queue_free(pa_queue* q, pa_free2_cb_t free_func, void *userdata) {
+void pa_queue_free(pa_queue *q, pa_free_cb_t free_func) {
void *data;
pa_assert(q);
while ((data = pa_queue_pop(q)))
if (free_func)
- free_func(data, userdata);
+ free_func(data);
pa_assert(!q->front);
pa_assert(!q->back);
USA.
***/
-#include <pulsecore/idxset.h>
+#include <pulse/def.h>
typedef struct pa_queue pa_queue;
/* Free the queue and run the specified callback function for every
* remaining entry. The callback function may be NULL. */
-void pa_queue_free(pa_queue* q, pa_free2_cb_t free_func, void *userdata);
+void pa_queue_free(pa_queue *q, pa_free_cb_t free_func);
void pa_queue_push(pa_queue *q, void *p);
void* pa_queue_pop(pa_queue *q);
pa_sink_input_unref(i);
}
- pa_queue_free(q, NULL, NULL);
+ pa_queue_free(q, NULL);
}
/* Called from main context */
pa_sink_input_unref(i);
}
- pa_queue_free(q, NULL, NULL);
+ pa_queue_free(q, NULL);
}
/* Called from IO thread context */
pa_source_output_unref(o);
}
- pa_queue_free(q, NULL, NULL);
+ pa_queue_free(q, NULL);
}
/* Called from main context */
pa_source_output_unref(o);
}
- pa_queue_free(q, NULL, NULL);
+ pa_queue_free(q, NULL);
}
/* Called from IO thread context */
pa_queue_push(q, (void*) "sechs");
pa_queue_push(q, (void*) "sieben");
- pa_queue_free(q, NULL, NULL);
+ pa_queue_free(q, NULL);
return 0;
}