mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-08 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove debug messages; don't queue request messages like nothing when send file is finished

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1546 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-07-26 14:40:17 +00:00
parent bbb347fa91
commit 86abfbf9e8
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pulsecore/sound-file-stream.c
View file

@ -62,8 +62,6 @@ static void file_stream_free(pa_object *o) {
file_stream *u = FILE_STREAM(o); file_stream *u = FILE_STREAM(o);
pa_assert(u); pa_assert(u);
pa_log("xxxx ffreee");
if (u->memchunk.memblock) if (u->memchunk.memblock)
pa_memblock_unref(u->memchunk.memblock); pa_memblock_unref(u->memchunk.memblock);
@ -76,11 +74,9 @@ static void file_stream_free(pa_object *o) {
static void file_stream_drop(file_stream *u) { static void file_stream_drop(file_stream *u) {
file_stream_assert_ref(u); file_stream_assert_ref(u);
pa_log("xxxx drop");
if (u->sink_input) { if (u->sink_input) {
pa_sink_input_disconnect(u->sink_input); pa_sink_input_disconnect(u->sink_input);
pa_sink_input_unref(u->sink_input); pa_sink_input_unref(u->sink_input);
u->sink_input = NULL; u->sink_input = NULL;
@ -116,6 +112,9 @@ static int sink_input_peek_cb(pa_sink_input *i, pa_memchunk *chunk) {
u = FILE_STREAM(i->userdata); u = FILE_STREAM(i->userdata);
file_stream_assert_ref(u); file_stream_assert_ref(u);
if (!u->sndfile)
return -1;
for (;;) { for (;;) {
if (!u->memchunk.memblock) { if (!u->memchunk.memblock) {
@ -132,11 +131,6 @@ static int sink_input_peek_cb(pa_sink_input *i, pa_memchunk *chunk) {
n = u->readf_function(u->sndfile, p, BUF_SIZE/fs); n = u->readf_function(u->sndfile, p, BUF_SIZE/fs);
pa_memblock_release(u->memchunk.memblock); pa_memblock_release(u->memchunk.memblock);
pa_log("%u/%u = data: %02x %02x %02x %02x %02x %02x %02x %02x",
(unsigned int) n, BUF_SIZE/fs,
((uint8_t*)p)[0], ((uint8_t*)p)[1], ((uint8_t*)p)[2], ((uint8_t*)p)[3],
((uint8_t*)p)[4], ((uint8_t*)p)[5], ((uint8_t*)p)[6], ((uint8_t*)p)[7]);
if (n <= 0) if (n <= 0)
n = 0; n = 0;
@ -161,6 +155,10 @@ static int sink_input_peek_cb(pa_sink_input *i, pa_memchunk *chunk) {
pa_memchunk_reset(&u->memchunk); pa_memchunk_reset(&u->memchunk);
pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u), MESSAGE_DROP_FILE_STREAM, NULL, NULL, NULL); pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u), MESSAGE_DROP_FILE_STREAM, NULL, NULL, NULL);
sf_close(u->sndfile);
u->sndfile = NULL;
return -1; return -1;
} }
} }