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

Port module-oss to the new lock-free core

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1501 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-06-25 22:54:06 +00:00
parent 63129389c9
commit eec2fbe623
1 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/modules/module-oss.c
View file

@ -56,6 +56,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <limits.h> #include <limits.h>
#include <signal.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/util.h> #include <pulse/util.h>
@ -138,7 +139,7 @@ static int suspend(struct userdata *u) {
pa_assert(u->fd >= 0); pa_assert(u->fd >= 0);
/* Let's suspend */ /* Let's suspend */
ioctl(u->fd, SNDCTL_DSP_SYNC); ioctl(u->fd, SNDCTL_DSP_SYNC, NULL);
close(u->fd); close(u->fd);
u->fd = -1; u->fd = -1;
@ -180,7 +181,7 @@ static int unsuspend(struct userdata *u) {
} }
if (ioctl(u->fd, SNDCTL_DSP_GETBLKSIZE, &frag_size) < 0) { if (ioctl(u->fd, SNDCTL_DSP_GETBLKSIZE, &frag_size) < 0) {
pa_log("SNDCTL_DSP_GETBLKSIZE: %s", pa_cstrerror(errno)); pa_log_warn("SNDCTL_DSP_GETBLKSIZE: %s", pa_cstrerror(errno));
goto fail; goto fail;
} }
@ -256,9 +257,6 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk *
case PA_SINK_MESSAGE_SET_STATE: case PA_SINK_MESSAGE_SET_STATE:
if (PA_PTR_TO_UINT(data) != PA_SINK_RUNNING && u->fd >= 0)
ioctl(u->fd, SNDCTL_DSP_POST);
if (PA_PTR_TO_UINT(data) == PA_SINK_SUSPENDED) { if (PA_PTR_TO_UINT(data) == PA_SINK_SUSPENDED) {
pa_assert(u->sink->thread_info.state != PA_SINK_SUSPENDED); pa_assert(u->sink->thread_info.state != PA_SINK_SUSPENDED);
@ -425,10 +423,14 @@ static void thread_func(void *userdata) {
pa_memchunk chunk; pa_memchunk chunk;
int r; int r;
/* pa_log("loop"); */
/* Check whether there is a message for us to process */ /* Check whether there is a message for us to process */
if (pa_asyncmsgq_get(u->asyncmsgq, &object, &code, &data, &chunk, 0) == 0) { if (pa_asyncmsgq_get(u->asyncmsgq, &object, &code, &data, &chunk, 0) == 0) {
int ret; int ret;
/* pa_log("processing msg"); */
if (!object && code == PA_MESSAGE_SHUTDOWN) { if (!object && code == PA_MESSAGE_SHUTDOWN) {
pa_asyncmsgq_done(u->asyncmsgq, 0); pa_asyncmsgq_done(u->asyncmsgq, 0);
goto finish; goto finish;
@ -437,11 +439,13 @@ static void thread_func(void *userdata) {
ret = pa_asyncmsgq_dispatch(object, code, data, &chunk); ret = pa_asyncmsgq_dispatch(object, code, data, &chunk);
pa_asyncmsgq_done(u->asyncmsgq, ret); pa_asyncmsgq_done(u->asyncmsgq, ret);
continue; continue;
} }
/* pa_log("loop2"); */
/* Render some data and write it to the dsp */ /* Render some data and write it to the dsp */
if (u->sink && u->sink->thread_info.state == PA_SINK_RUNNING && (pollfd[POLLFD_DSP].revents & POLLOUT)) { if (u->sink && u->sink->thread_info.state != PA_SINK_SUSPENDED && (pollfd[POLLFD_DSP].revents & POLLOUT)) {
ssize_t l; ssize_t l;
void *p; void *p;
int loop = 0; int loop = 0;
@ -476,6 +480,8 @@ static void thread_func(void *userdata) {
t = pa_write(u->fd, (uint8_t*) p + u->memchunk.index, u->memchunk.length, &write_type); t = pa_write(u->fd, (uint8_t*) p + u->memchunk.index, u->memchunk.length, &write_type);
pa_memblock_release(u->memchunk.memblock); pa_memblock_release(u->memchunk.memblock);
/* pa_log("wrote %i bytes", t); */
pa_assert(t != 0); pa_assert(t != 0);
if (t < 0) { if (t < 0) {
@ -515,7 +521,7 @@ static void thread_func(void *userdata) {
/* Try to read some data and pass it on to the source driver */ /* Try to read some data and pass it on to the source driver */
if (u->source && u->source->thread_info.state == PA_SOURCE_RUNNING && ((pollfd[POLLFD_DSP].revents & POLLIN))) { if (u->source && u->source->thread_info.state != PA_SOURCE_SUSPENDED && ((pollfd[POLLFD_DSP].revents & POLLIN))) {
void *p; void *p;
ssize_t l; ssize_t l;
pa_memchunk memchunk; pa_memchunk memchunk;
@ -585,8 +591,8 @@ static void thread_func(void *userdata) {
if (u->fd >= 0) { if (u->fd >= 0) {
pollfd[POLLFD_DSP].fd = u->fd; pollfd[POLLFD_DSP].fd = u->fd;
pollfd[POLLFD_DSP].events = pollfd[POLLFD_DSP].events =
((u->source && u->source->thread_info.state == PA_SOURCE_RUNNING) ? POLLIN : 0) | ((u->source && u->source->thread_info.state != PA_SOURCE_SUSPENDED) ? POLLIN : 0) |
((u->sink && u->sink->thread_info.state == PA_SINK_RUNNING) ? POLLOUT : 0); ((u->sink && u->sink->thread_info.state != PA_SINK_SUSPENDED) ? POLLOUT : 0);
} }
/* Hmm, nothing to do. Let's sleep */ /* Hmm, nothing to do. Let's sleep */
@ -594,9 +600,9 @@ static void thread_func(void *userdata) {
if (pa_asyncmsgq_before_poll(u->asyncmsgq) < 0) if (pa_asyncmsgq_before_poll(u->asyncmsgq) < 0)
continue; continue;
/* pa_log("polling for %u", pollfd[POLLFD_DSP].events); */ /* pa_log("polling for %i", u->fd >= 0 ? pollfd[POLLFD_DSP].events : -1); */
r = poll(pollfd, u->fd >= 0 ? POLLFD_MAX : POLLFD_DSP, -1); r = poll(pollfd, u->fd >= 0 ? POLLFD_MAX : POLLFD_DSP, -1);
/* pa_log("polling got %u", r > 0 ? pollfd[POLLFD_DSP].revents : 0); */ /* pa_log("polling got dsp=%i amq=%i (%i)", r > 0 ? pollfd[POLLFD_DSP].revents : 0, r > 0 ? pollfd[POLLFD_ASYNCQ].revents : 0, r); */
pa_asyncmsgq_after_poll(u->asyncmsgq); pa_asyncmsgq_after_poll(u->asyncmsgq);
@ -611,6 +617,8 @@ static void thread_func(void *userdata) {
goto fail; goto fail;
} }
pa_assert(r > 0);
if (pollfd[POLLFD_DSP].revents & ~(POLLOUT|POLLIN)) { if (pollfd[POLLFD_DSP].revents & ~(POLLOUT|POLLIN)) {
pa_log("DSP shutdown."); pa_log("DSP shutdown.");
goto fail; goto fail;
@ -708,9 +716,9 @@ 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;
u->use_getospace = u->use_getispace = 0; u->use_getospace = u->use_getispace = 1;
u->use_getodelay = 0; u->use_getodelay = 1;
u->use_input_volume = u->use_pcm_volume = 0; u->use_input_volume = u->use_pcm_volume = 1;
u->mode = mode; u->mode = mode;
u->device_name = pa_xstrdup(p); u->device_name = pa_xstrdup(p);
u->nfrags = nfrags; u->nfrags = nfrags;