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

fix a typo and some minor optimizations

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1487 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-06-23 20:02:28 +00:00
parent 1c9bd201ec
commit fff9081c4b
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/module-pipe-source.c
View file

@ -99,8 +99,6 @@ static void thread_func(void *userdata) {
pa_log_debug("Thread starting up"); pa_log_debug("Thread starting up");
pa_memchunk_reset(&u->memchunk);
memset(&pollfd, 0, sizeof(pollfd)); memset(&pollfd, 0, sizeof(pollfd));
pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->asyncmsgq); pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->asyncmsgq);
@ -128,19 +126,19 @@ static void thread_func(void *userdata) {
continue; continue;
} }
/* Render some data and write it to the fifo */ /* Try to read some data and pass it on to the source driver */
if (u->source->thread_info.state == PA_SOURCE_RUNNING && pollfd[POLLFD_FIFO].revents) { if (u->source->thread_info.state == PA_SOURCE_RUNNING && pollfd[POLLFD_FIFO].revents) {
void *p; void *p;
ssize_t l; ssize_t l;
if (!u->memchunk.memblock) { if (!u->memchunk.memblock) {
u->memchunk.memblock = pa_memblock_new(u->core->mempool, PIPE_BUF); u->memchunk.memblock = pa_memblock_new(u->core->mempool, PIPE_BUF);
u->memchunk.index = u->memchunk.length = 0; u->memchunk.index = u->memchunk.length = 0;
} }
pa_assert(pa_memblock_get_length(u->memchunk.memblock) > u->memchunk.index); pa_assert(pa_memblock_get_length(u->memchunk.memblock) > u->memchunk.index);
p = pa_memblock_acquire(u->memchunk.memblock); p = pa_memblock_acquire(u->memchunk.memblock);
l = pa_read(u->fd, (uint8_t*) p + u->memchunk.index, pa_memblock_get_length(u->memchunk.memblock) - u->memchunk.index, &read_type); l = pa_read(u->fd, (uint8_t*) p + u->memchunk.index, pa_memblock_get_length(u->memchunk.memblock) - u->memchunk.index, &read_type);
pa_memblock_release(u->memchunk.memblock); pa_memblock_release(u->memchunk.memblock);
@ -157,7 +155,7 @@ static void thread_func(void *userdata) {
} }
} else { } else {
u->memchunk.length = l; u->memchunk.length = l;
pa_source_post(u->source, &u->memchunk); pa_source_post(u->source, &u->memchunk);
u->memchunk.index += l; u->memchunk.index += l;
@ -172,7 +170,7 @@ static void thread_func(void *userdata) {
} }
} }
pollfd[POLLFD_FIFO].events = u->source->thread_info.state == PA_SINK_RUNNING ? POLLIN : 0; pollfd[POLLFD_FIFO].events = u->source->thread_info.state == PA_SOURCE_RUNNING ? POLLIN : 0;
/* Hmm, nothing to do. Let's sleep */ /* Hmm, nothing to do. Let's sleep */
@ -237,7 +235,8 @@ int pa__init(pa_core *c, pa_module*m) {
u->core = c; u->core = c;
u->module = m; u->module = m;
m->userdata = u; m->userdata = u;
pa_memchunk_reset(&u->memchunk);
pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0)); pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0));
u->filename = pa_xstrdup(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME)); u->filename = pa_xstrdup(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME));