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

Fix handling of the io flags in duplex mode.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1048 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-06-20 16:43:46 +00:00
parent 1040b69cf2
commit 320bedb580
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/utils/padsp.c
View file

@ -75,6 +75,7 @@ struct fd_info {
pa_stream *rec_stream; pa_stream *rec_stream;
pa_io_event *io_event; pa_io_event *io_event;
pa_io_event_flags_t io_flags;
void *buf; void *buf;
size_t rec_offset; size_t rec_offset;
@ -557,6 +558,7 @@ static fd_info* fd_info_new(fd_info_type_t type, int *_errno) {
i->play_stream = NULL; i->play_stream = NULL;
i->rec_stream = NULL; i->rec_stream = NULL;
i->io_event = NULL; i->io_event = NULL;
i->io_flags = 0;
pthread_mutex_init(&i->mutex, NULL); pthread_mutex_init(&i->mutex, NULL);
i->ref = 1; i->ref = 1;
i->buf = NULL; i->buf = NULL;
@ -709,13 +711,10 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
if (i->io_event) { if (i->io_event) {
pa_mainloop_api *api; pa_mainloop_api *api;
pa_io_event_flags_t flags;
size_t n; size_t n;
api = pa_threaded_mainloop_get_api(i->mainloop); api = pa_threaded_mainloop_get_api(i->mainloop);
flags = 0;
if (s == i->play_stream) { if (s == i->play_stream) {
n = pa_stream_writable_size(i->play_stream); n = pa_stream_writable_size(i->play_stream);
if (n == (size_t)-1) { if (n == (size_t)-1) {
@ -724,7 +723,9 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
} }
if (n >= i->fragment_size) if (n >= i->fragment_size)
flags |= PA_IO_EVENT_INPUT; i->io_flags |= PA_IO_EVENT_INPUT;
else
i->io_flags &= ~PA_IO_EVENT_INPUT;
} }
if (s == i->rec_stream) { if (s == i->rec_stream) {
@ -735,10 +736,12 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
} }
if (n >= i->fragment_size) if (n >= i->fragment_size)
flags |= PA_IO_EVENT_OUTPUT; i->io_flags |= PA_IO_EVENT_OUTPUT;
else
i->io_flags &= ~PA_IO_EVENT_OUTPUT;
} }
api->io_enable(i->io_event, flags); api->io_enable(i->io_event, i->io_flags);
} }
} }
@ -757,6 +760,7 @@ static void fd_info_shutdown(fd_info *i) {
api = pa_threaded_mainloop_get_api(i->mainloop); api = pa_threaded_mainloop_get_api(i->mainloop);
api->io_free(i->io_event); api->io_free(i->io_event);
i->io_event = NULL; i->io_event = NULL;
i->io_flags = 0;
} }
if (i->thread_fd >= 0) { if (i->thread_fd >= 0) {
@ -767,13 +771,10 @@ static void fd_info_shutdown(fd_info *i) {
static int fd_info_copy_data(fd_info *i, int force) { static int fd_info_copy_data(fd_info *i, int force) {
size_t n; size_t n;
pa_io_event_flags_t flags;
if (!i->play_stream && !i->rec_stream) if (!i->play_stream && !i->rec_stream)
return -1; return -1;
flags = 0;
if ((i->play_stream) && (pa_stream_get_state(i->play_stream) == PA_STREAM_READY)) { if ((i->play_stream) && (pa_stream_get_state(i->play_stream) == PA_STREAM_READY)) {
n = pa_stream_writable_size(i->play_stream); n = pa_stream_writable_size(i->play_stream);
@ -814,7 +815,9 @@ static int fd_info_copy_data(fd_info *i, int force) {
} }
if (n >= i->fragment_size) if (n >= i->fragment_size)
flags |= PA_IO_EVENT_INPUT; i->io_flags |= PA_IO_EVENT_INPUT;
else
i->io_flags &= ~PA_IO_EVENT_INPUT;
} }
if ((i->rec_stream) && (pa_stream_get_state(i->rec_stream) == PA_STREAM_READY)) { if ((i->rec_stream) && (pa_stream_get_state(i->rec_stream) == PA_STREAM_READY)) {
@ -867,14 +870,16 @@ static int fd_info_copy_data(fd_info *i, int force) {
} }
if (n >= i->fragment_size) if (n >= i->fragment_size)
flags |= PA_IO_EVENT_OUTPUT; i->io_flags |= PA_IO_EVENT_OUTPUT;
else
i->io_flags &= ~PA_IO_EVENT_OUTPUT;
} }
if (i->io_event) { if (i->io_event) {
pa_mainloop_api *api; pa_mainloop_api *api;
api = pa_threaded_mainloop_get_api(i->mainloop); api = pa_threaded_mainloop_get_api(i->mainloop);
api->io_enable(i->io_event, flags); api->io_enable(i->io_event, i->io_flags);
} }
return 0; return 0;
@ -1034,7 +1039,6 @@ static int dsp_open(int flags, int *_errno) {
pa_mainloop_api *api; pa_mainloop_api *api;
int ret; int ret;
int f; int f;
pa_io_event_flags_t ioflags;
debug(DEBUG_LEVEL_NORMAL, __FILE__": dsp_open()\n"); debug(DEBUG_LEVEL_NORMAL, __FILE__": dsp_open()\n");
@ -1056,23 +1060,23 @@ static int dsp_open(int flags, int *_errno) {
switch (flags & O_ACCMODE) { switch (flags & O_ACCMODE) {
case O_RDONLY: case O_RDONLY:
ioflags = PA_IO_EVENT_OUTPUT; i->io_flags = PA_IO_EVENT_OUTPUT;
shutdown(i->thread_fd, SHUT_RD); shutdown(i->thread_fd, SHUT_RD);
shutdown(i->app_fd, SHUT_WR); shutdown(i->app_fd, SHUT_WR);
break; break;
case O_WRONLY: case O_WRONLY:
ioflags = PA_IO_EVENT_INPUT; i->io_flags = PA_IO_EVENT_INPUT;
shutdown(i->thread_fd, SHUT_WR); shutdown(i->thread_fd, SHUT_WR);
shutdown(i->app_fd, SHUT_RD); shutdown(i->app_fd, SHUT_RD);
break; break;
case O_RDWR: case O_RDWR:
ioflags = PA_IO_EVENT_INPUT | PA_IO_EVENT_OUTPUT; i->io_flags = PA_IO_EVENT_INPUT | PA_IO_EVENT_OUTPUT;
break; break;
default: default:
return -1; return -1;
} }
if (!(i->io_event = api->io_new(api, i->thread_fd, ioflags, io_event_cb, i))) if (!(i->io_event = api->io_new(api, i->thread_fd, i->io_flags, io_event_cb, i)))
goto fail; goto fail;
pa_threaded_mainloop_unlock(i->mainloop); pa_threaded_mainloop_unlock(i->mainloop);