diff options
author | Lennart Poettering <lennart@poettering.net> | 2007-07-31 22:44:53 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2007-07-31 22:44:53 +0000 |
commit | 0defdfb5607889c35fdefff4af31eb8b0ae0cbcf (patch) | |
tree | 8a8a93281aa32baa815185de5b2cb869f30376bf /src/modules | |
parent | a82505e72f6680258b8162b846c98c64bea45c37 (diff) |
A lot of updates, all necessary to get the native protocol ported:
* add an int64_t argument to pa_asyncmsgq because it is very difficult to pass 64 values otherwise
* simplify subclassing in pa_object
* s/drop/unlink/ at some places
* port the native protocol to the lock-free core (not tested, compiles fine)
* move synchronisation of playback streams into pa_sink_input
* add "start_corked" field to pa_sink_input_new_data
* allow casting of NULL values in pa_object
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1562 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/module-alsa-sink.c | 13 | ||||
-rw-r--r-- | src/modules/module-alsa-source.c | 13 | ||||
-rw-r--r-- | src/modules/module-null-sink.c | 13 | ||||
-rw-r--r-- | src/modules/module-oss.c | 21 | ||||
-rw-r--r-- | src/modules/module-pipe-sink.c | 13 | ||||
-rw-r--r-- | src/modules/module-pipe-source.c | 9 |
6 files changed, 44 insertions, 38 deletions
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c index 9ca881d1..551bad89 100644 --- a/src/modules/module-alsa-sink.c +++ b/src/modules/module-alsa-sink.c @@ -302,7 +302,7 @@ fail: return -1; } -static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk *chunk) { +static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { struct userdata *u = PA_SINK(o)->userdata; switch (code) { @@ -347,7 +347,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk * break; } - return pa_sink_process_msg(o, code, data, chunk); + return pa_sink_process_msg(o, code, data, offset, chunk); } static int mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) { @@ -510,12 +510,13 @@ static void thread_func(void *userdata) { int code; void *data; pa_memchunk chunk; + int64_t offset; int r; /* pa_log("loop"); */ /* 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, &offset, &chunk, 0) == 0) { int ret; /* pa_log("processing msg"); */ @@ -525,7 +526,7 @@ static void thread_func(void *userdata) { goto finish; } - ret = pa_asyncmsgq_dispatch(object, code, data, &chunk); + ret = pa_asyncmsgq_dispatch(object, code, data, offset, &chunk); pa_asyncmsgq_done(u->asyncmsgq, ret); continue; } @@ -660,7 +661,7 @@ static void thread_func(void *userdata) { fail: /* We have to continue processing messages until we receive the * SHUTDOWN message */ - pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, NULL, NULL); + pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL); pa_asyncmsgq_wait_for(u->asyncmsgq, PA_MESSAGE_SHUTDOWN); finish: @@ -893,7 +894,7 @@ void pa__done(pa_core *c, pa_module*m) { pa_sink_disconnect(u->sink); if (u->thread) { - pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, NULL); + pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); pa_thread_free(u->thread); } diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c index 59414d33..c2dad6f9 100644 --- a/src/modules/module-alsa-source.c +++ b/src/modules/module-alsa-source.c @@ -290,7 +290,7 @@ fail: return -1; } -static int source_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk *chunk) { +static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { struct userdata *u = PA_SOURCE(o)->userdata; switch (code) { @@ -335,7 +335,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk break; } - return pa_source_process_msg(o, code, data, chunk); + return pa_source_process_msg(o, code, data, offset, chunk); } static int mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) { @@ -498,12 +498,13 @@ static void thread_func(void *userdata) { int code; void *data; int r; + int64_t offset; pa_memchunk chunk; /* pa_log("loop"); */ /* 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, &offset, &chunk, 0) == 0) { int ret; /* pa_log("processing msg"); */ @@ -513,7 +514,7 @@ static void thread_func(void *userdata) { goto finish; } - ret = pa_asyncmsgq_dispatch(object, code, data, &chunk); + ret = pa_asyncmsgq_dispatch(object, code, data, offset, &chunk); pa_asyncmsgq_done(u->asyncmsgq, ret); continue; } @@ -634,7 +635,7 @@ static void thread_func(void *userdata) { fail: /* We have to continue processing messages until we receive the * SHUTDOWN message */ - pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, NULL, NULL); + pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL); pa_asyncmsgq_wait_for(u->asyncmsgq, PA_MESSAGE_SHUTDOWN); finish: @@ -864,7 +865,7 @@ void pa__done(pa_core *c, pa_module*m) { pa_source_disconnect(u->source); if (u->thread) { - pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, NULL); + pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); pa_thread_free(u->thread); } diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c index bb0a5045..f0e3a061 100644 --- a/src/modules/module-null-sink.c +++ b/src/modules/module-null-sink.c @@ -83,7 +83,7 @@ static const char* const valid_modargs[] = { NULL }; -static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk *chunk) { +static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { struct userdata *u = PA_SINK(o)->userdata; switch (code) { @@ -107,7 +107,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk * } } - return pa_sink_process_msg(o, code, data, chunk); + return pa_sink_process_msg(o, code, data, offset, chunk); } static void thread_func(void *userdata) { @@ -131,9 +131,10 @@ static void thread_func(void *userdata) { pa_memchunk chunk; int r, timeout; struct timeval now; + int64_t offset; /* 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, &offset, &chunk, 0) == 0) { int ret; if (!object && code == PA_MESSAGE_SHUTDOWN) { @@ -141,7 +142,7 @@ static void thread_func(void *userdata) { goto finish; } - ret = pa_asyncmsgq_dispatch(object, code, data, &chunk); + ret = pa_asyncmsgq_dispatch(object, code, data, offset, &chunk); pa_asyncmsgq_done(u->asyncmsgq, ret); continue; } @@ -190,7 +191,7 @@ static void thread_func(void *userdata) { fail: /* We have to continue processing messages until we receive the * SHUTDOWN message */ - pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, NULL, NULL); + pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL); pa_asyncmsgq_wait_for(u->asyncmsgq, PA_MESSAGE_SHUTDOWN); finish: @@ -271,7 +272,7 @@ void pa__done(pa_core *c, pa_module*m) { pa_sink_disconnect(u->sink); if (u->thread) { - pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, NULL); + pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); pa_thread_free(u->thread); } diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c index 63f4d40e..a43bdb3c 100644 --- a/src/modules/module-oss.c +++ b/src/modules/module-oss.c @@ -581,7 +581,7 @@ fail: return -1; } -static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk *chunk) { +static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { struct userdata *u = PA_SINK(o)->userdata; int do_trigger = 0, ret, quick = 1; @@ -673,7 +673,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk * break; } - ret = pa_sink_process_msg(o, code, data, chunk); + ret = pa_sink_process_msg(o, code, data, offset, chunk); if (do_trigger) trigger(u, quick); @@ -681,7 +681,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk * return ret; } -static int source_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk *chunk) { +static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { struct userdata *u = PA_SOURCE(o)->userdata; int do_trigger = 0, ret, quick = 1; @@ -770,7 +770,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk break; } - ret = pa_source_process_msg(o, code, data, chunk); + ret = pa_source_process_msg(o, code, data, offset, chunk); if (do_trigger) trigger(u, quick); @@ -807,11 +807,12 @@ static void thread_func(void *userdata) { void *data; pa_memchunk chunk; int r; + int64_t offset; /* pa_log("loop"); */ /* 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, &offset, &chunk, 0) == 0) { int ret; /* pa_log("processing msg"); */ @@ -821,7 +822,7 @@ static void thread_func(void *userdata) { goto finish; } - ret = pa_asyncmsgq_dispatch(object, code, data, &chunk); + ret = pa_asyncmsgq_dispatch(object, code, data, offset, &chunk); pa_asyncmsgq_done(u->asyncmsgq, ret); continue; } @@ -1051,7 +1052,7 @@ static void thread_func(void *userdata) { fail: /* We have to continue processing messages until we receive the * SHUTDOWN message */ - pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, NULL, NULL); + pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL); pa_asyncmsgq_wait_for(u->asyncmsgq, PA_MESSAGE_SHUTDOWN); finish: @@ -1300,9 +1301,9 @@ go_on: /* Read mixer settings */ if (u->source) - pa_asyncmsgq_post(u->asyncmsgq, PA_MSGOBJECT(u->source), PA_SOURCE_MESSAGE_GET_VOLUME, &u->source->volume, NULL, NULL); + pa_asyncmsgq_post(u->asyncmsgq, PA_MSGOBJECT(u->source), PA_SOURCE_MESSAGE_GET_VOLUME, &u->source->volume, 0, NULL, NULL); if (u->sink) - pa_asyncmsgq_post(u->asyncmsgq, PA_MSGOBJECT(u->sink), PA_SINK_MESSAGE_GET_VOLUME, &u->sink->volume, NULL, NULL); + pa_asyncmsgq_post(u->asyncmsgq, PA_MSGOBJECT(u->sink), PA_SINK_MESSAGE_GET_VOLUME, &u->sink->volume, 0, NULL, NULL); return 0; @@ -1335,7 +1336,7 @@ void pa__done(pa_core *c, pa_module*m) { pa_source_disconnect(u->source); if (u->thread) { - pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, NULL); + pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); pa_thread_free(u->thread); } diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c index db8b2e10..83ee06b7 100644 --- a/src/modules/module-pipe-sink.c +++ b/src/modules/module-pipe-sink.c @@ -84,7 +84,7 @@ static const char* const valid_modargs[] = { NULL }; -static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk *chunk) { +static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { struct userdata *u = PA_SINK(o)->userdata; switch (code) { @@ -103,7 +103,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memchunk * } } - return pa_sink_process_msg(o, code, data, chunk); + return pa_sink_process_msg(o, code, data, offset, chunk); } static void thread_func(void *userdata) { @@ -133,9 +133,10 @@ static void thread_func(void *userdata) { void *data; pa_memchunk chunk; int r; + int64_t offset; /* 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, &offset, &chunk, 0) == 0) { int ret; if (!object && code == PA_MESSAGE_SHUTDOWN) { @@ -143,7 +144,7 @@ static void thread_func(void *userdata) { goto finish; } - ret = pa_asyncmsgq_dispatch(object, code, data, &chunk); + ret = pa_asyncmsgq_dispatch(object, code, data, offset, &chunk); pa_asyncmsgq_done(u->asyncmsgq, ret); continue; } @@ -224,7 +225,7 @@ static void thread_func(void *userdata) { fail: /* We have to continue processing messages until we receive the * SHUTDOWN message */ - pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, NULL, NULL); + pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL); pa_asyncmsgq_wait_for(u->asyncmsgq, PA_MESSAGE_SHUTDOWN); finish: @@ -326,7 +327,7 @@ void pa__done(pa_core *c, pa_module*m) { pa_sink_disconnect(u->sink); if (u->thread) { - pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, NULL); + pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); pa_thread_free(u->thread); } diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c index 5dbb1e7b..a5f95f9a 100644 --- a/src/modules/module-pipe-source.c +++ b/src/modules/module-pipe-source.c @@ -111,9 +111,10 @@ static void thread_func(void *userdata) { void *data; pa_memchunk chunk; int r; + int64_t offset; /* 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, &offset, &chunk, 0) == 0) { int ret; if (!object && code == PA_MESSAGE_SHUTDOWN) { @@ -121,7 +122,7 @@ static void thread_func(void *userdata) { goto finish; } - ret = pa_asyncmsgq_dispatch(object, code, data, &chunk); + ret = pa_asyncmsgq_dispatch(object, code, data, offset, &chunk); pa_asyncmsgq_done(u->asyncmsgq, ret); continue; } @@ -202,7 +203,7 @@ static void thread_func(void *userdata) { fail: /* We have to continue processing messages until we receive the * SHUTDOWN message */ - pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, NULL, NULL); + pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL); pa_asyncmsgq_wait_for(u->asyncmsgq, PA_MESSAGE_SHUTDOWN); finish: @@ -303,7 +304,7 @@ void pa__done(pa_core *c, pa_module*m) { pa_source_disconnect(u->source); if (u->thread) { - pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, NULL); + pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); pa_thread_free(u->thread); } |