summaryrefslogtreecommitdiffstats
path: root/src/pulse
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2006-11-06 13:06:01 +0000
committerPierre Ossman <ossman@cendio.se>2006-11-06 13:06:01 +0000
commit8dc62142765249addf131b058c27f931ede1776b (patch)
tree3e9f8b96248e98c83462a45e983e0b298b38ca79 /src/pulse
parent6ca819354cabdaeda0b122535a50fa49924d8d2d (diff)
Revert r1404 and keep it on a development branch until it is fully tested.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1409 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulse')
-rw-r--r--src/pulse/internal.h1
-rw-r--r--src/pulse/stream.c20
2 files changed, 4 insertions, 17 deletions
diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index 76d80d83..4eef4b4a 100644
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -113,7 +113,6 @@ struct pa_stream {
uint32_t requested_bytes;
pa_memchunk peek_memchunk;
- void *peek_data;
pa_memblockq *record_memblockq;
int corked;
diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index d31127d8..180cd096 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -88,7 +88,6 @@ pa_stream *pa_stream_new(pa_context *c, const char *name, const pa_sample_spec *
s->peek_memchunk.index = 0;
s->peek_memchunk.length = 0;
s->peek_memchunk.memblock = NULL;
- s->peek_data = NULL;
s->record_memblockq = NULL;
@@ -123,11 +122,8 @@ static void stream_free(pa_stream *s) {
s->mainloop->time_free(s->auto_timing_update_event);
}
- if (s->peek_memchunk.memblock) {
- if (s->peek_data)
- pa_memblock_release(s->peek_memchunk.memblock);
+ if (s->peek_memchunk.memblock)
pa_memblock_unref(s->peek_memchunk.memblock);
- }
if (s->record_memblockq)
pa_memblockq_free(s->record_memblockq);
@@ -609,11 +605,8 @@ int pa_stream_write(
if (free_cb)
chunk.memblock = pa_memblock_new_user(s->context->mempool, (void*) data, length, free_cb, 1);
else {
- void *tdata;
chunk.memblock = pa_memblock_new(s->context->mempool, length);
- tdata = pa_memblock_acquire(chunk.memblock);
- memcpy(tdata, data, length);
- pa_memblock_release(chunk.memblock);
+ memcpy(chunk.memblock->data, data, length);
}
chunk.index = 0;
@@ -679,12 +672,9 @@ int pa_stream_peek(pa_stream *s, const void **data, size_t *length) {
*length = 0;
return 0;
}
-
- s->peek_data = pa_memblock_acquire(s->peek_memchunk.memblock);
}
- assert(s->peek_data);
- *data = (uint8_t*) s->peek_data + s->peek_memchunk.index;
+ *data = (const char*) s->peek_memchunk.memblock->data + s->peek_memchunk.index;
*length = s->peek_memchunk.length;
return 0;
}
@@ -702,9 +692,7 @@ int pa_stream_drop(pa_stream *s) {
/* Fix the simulated local read index */
if (s->timing_info_valid && !s->timing_info.read_index_corrupt)
s->timing_info.read_index += s->peek_memchunk.length;
-
- assert(s->peek_data);
- pa_memblock_release(s->peek_memchunk.memblock);
+
pa_memblock_unref(s->peek_memchunk.memblock);
s->peek_memchunk.length = 0;
s->peek_memchunk.index = 0;