summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-08-10 22:01:54 +0000
committerLennart Poettering <lennart@poettering.net>2007-08-10 22:01:54 +0000
commitb3f1a133f1600adc112044aafd799e35462fdf7d (patch)
tree7b5d61ae3173d58c7bc84ef907956e9c931d5737
parentf7171e86caef4f71f58d4f65d9cada4e53a19396 (diff)
minor update
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1623 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/pstream.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
index ea238805..ed552705 100644
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -238,7 +238,6 @@ pa_pstream *pa_pstream_new(pa_mainloop_api *m, pa_iochannel *io, pa_mempool *poo
m->defer_enable(p->defer_event, 0);
p->send_queue = pa_queue_new();
- pa_assert(p->send_queue);
p->write.current = NULL;
p->write.index = 0;
@@ -377,6 +376,7 @@ void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa
p->mainloop->defer_enable(p->defer_event, 1);
}
+/* might be called from thread context */
static void memimport_release_cb(pa_memimport *i, uint32_t block_id, void *userdata) {
struct item_info *item;
pa_pstream *p = userdata;
@@ -400,6 +400,7 @@ static void memimport_release_cb(pa_memimport *i, uint32_t block_id, void *userd
p->mainloop->defer_enable(p->defer_event, 1);
}
+/* might be called from thread context */
static void memexport_revoke_cb(pa_memexport *e, uint32_t block_id, void *userdata) {
struct item_info *item;
pa_pstream *p = userdata;