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

fix build for auxiliary modules

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2310 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-04-23 19:22:56 +00:00
parent c8fc223fe9
commit 067a68abf9
8 changed files with 19 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/module-combine.c
View file

@ -384,7 +384,7 @@ static void sink_input_attach_cb(pa_sink_input *i) {
/* Set up the queue from the sink thread to us */ /* Set up the queue from the sink thread to us */
pa_assert(!o->inq_rtpoll_item); pa_assert(!o->inq_rtpoll_item);
o->inq_rtpoll_item = pa_rtpoll_item_new_asyncmsgq( o->inq_rtpoll_item = pa_rtpoll_item_new_asyncmsgq_read(
i->sink->rtpoll, i->sink->rtpoll,
PA_RTPOLL_LATE, /* This one is not that important, since we check for data in _peek() anyway. */ PA_RTPOLL_LATE, /* This one is not that important, since we check for data in _peek() anyway. */
o->inq); o->inq);
@ -584,7 +584,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
/* Create pa_asyncmsgq to the sink thread */ /* Create pa_asyncmsgq to the sink thread */
op->outq_rtpoll_item = pa_rtpoll_item_new_asyncmsgq( op->outq_rtpoll_item = pa_rtpoll_item_new_asyncmsgq_read(
u->rtpoll, u->rtpoll,
PA_RTPOLL_EARLY-1, /* This item is very important */ PA_RTPOLL_EARLY-1, /* This item is very important */
op->outq); op->outq);
@ -786,7 +786,7 @@ static struct output *output_new(struct userdata *u, pa_sink *sink) {
/* If the sink is not yet started, we need to do the activation ourselves */ /* If the sink is not yet started, we need to do the activation ourselves */
PA_LLIST_PREPEND(struct output, u->thread_info.active_outputs, o); PA_LLIST_PREPEND(struct output, u->thread_info.active_outputs, o);
o->outq_rtpoll_item = pa_rtpoll_item_new_asyncmsgq( o->outq_rtpoll_item = pa_rtpoll_item_new_asyncmsgq_read(
u->rtpoll, u->rtpoll,
PA_RTPOLL_EARLY-1, /* This item is very important */ PA_RTPOLL_EARLY-1, /* This item is very important */
o->outq); o->outq);
@ -945,8 +945,8 @@ int pa__init(pa_module*m) {
u->master = NULL; u->master = NULL;
u->time_event = NULL; u->time_event = NULL;
u->adjust_time = DEFAULT_ADJUST_TIME; u->adjust_time = DEFAULT_ADJUST_TIME;
pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
u->rtpoll = pa_rtpoll_new(); u->rtpoll = pa_rtpoll_new();
pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
u->thread = NULL; u->thread = NULL;
u->resample_method = resample_method; u->resample_method = resample_method;
u->outputs = pa_idxset_new(NULL, NULL); u->outputs = pa_idxset_new(NULL, NULL);
@ -955,7 +955,6 @@ int pa__init(pa_module*m) {
PA_LLIST_HEAD_INIT(struct output, u->thread_info.active_outputs); PA_LLIST_HEAD_INIT(struct output, u->thread_info.active_outputs);
pa_atomic_store(&u->thread_info.running, FALSE); pa_atomic_store(&u->thread_info.running, FALSE);
u->thread_info.in_null_mode = FALSE; u->thread_info.in_null_mode = FALSE;
pa_rtpoll_item_new_asyncmsgq(u->rtpoll, PA_RTPOLL_EARLY, u->thread_mq.inq);
if (pa_modargs_get_value_u32(ma, "adjust_time", &u->adjust_time) < 0) { if (pa_modargs_get_value_u32(ma, "adjust_time", &u->adjust_time) < 0) {
pa_log("Failed to parse adjust_time value"); pa_log("Failed to parse adjust_time value");

3
src/modules/module-esound-sink.c
View file

@ -538,9 +538,8 @@ int pa__init(pa_module*m) {
pa_memchunk_reset(&u->memchunk); pa_memchunk_reset(&u->memchunk);
u->offset = 0; u->offset = 0;
pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
u->rtpoll = pa_rtpoll_new(); u->rtpoll = pa_rtpoll_new();
pa_rtpoll_item_new_asyncmsgq(u->rtpoll, PA_RTPOLL_EARLY, u->thread_mq.inq); pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
u->rtpoll_item = NULL; u->rtpoll_item = NULL;
u->format = u->format =

5
src/modules/module-jack-sink.c
View file

@ -301,9 +301,8 @@ int pa__init(pa_module*m) {
u->module = m; u->module = m;
m->userdata = u; m->userdata = u;
u->saved_frame_time_valid = FALSE; u->saved_frame_time_valid = FALSE;
pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
u->rtpoll = pa_rtpoll_new(); u->rtpoll = pa_rtpoll_new();
pa_rtpoll_item_new_asyncmsgq(u->rtpoll, PA_RTPOLL_EARLY, u->thread_mq.inq); pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
/* The queue linking the JACK thread and our RT thread */ /* The queue linking the JACK thread and our RT thread */
u->jack_msgq = pa_asyncmsgq_new(0); u->jack_msgq = pa_asyncmsgq_new(0);
@ -313,7 +312,7 @@ int pa__init(pa_module*m) {
* all other drivers make: supplying the audio device with data is * all other drivers make: supplying the audio device with data is
* the top priority -- and as long as that is possible we don't do * the top priority -- and as long as that is possible we don't do
* anything else */ * anything else */
u->rtpoll_item = pa_rtpoll_item_new_asyncmsgq(u->rtpoll, PA_RTPOLL_EARLY-1, u->jack_msgq); u->rtpoll_item = pa_rtpoll_item_new_asyncmsgq_read(u->rtpoll, PA_RTPOLL_EARLY-1, u->jack_msgq);
if (!(u->client = jack_client_open(client_name, server_name ? JackServerName : JackNullOption, &status, server_name))) { if (!(u->client = jack_client_open(client_name, server_name ? JackServerName : JackNullOption, &status, server_name))) {
pa_log("jack_client_open() failed."); pa_log("jack_client_open() failed.");

5
src/modules/module-jack-source.c
View file

@ -279,12 +279,11 @@ int pa__init(pa_module*m) {
m->userdata = u; m->userdata = u;
u->saved_frame_time_valid = FALSE; u->saved_frame_time_valid = FALSE;
pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
u->rtpoll = pa_rtpoll_new(); u->rtpoll = pa_rtpoll_new();
pa_rtpoll_item_new_asyncmsgq(u->rtpoll, PA_RTPOLL_EARLY, u->thread_mq.inq); pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
u->jack_msgq = pa_asyncmsgq_new(0); u->jack_msgq = pa_asyncmsgq_new(0);
u->rtpoll_item = pa_rtpoll_item_new_asyncmsgq(u->rtpoll, PA_RTPOLL_EARLY-1, u->jack_msgq); u->rtpoll_item = pa_rtpoll_item_new_asyncmsgq_read(u->rtpoll, PA_RTPOLL_EARLY-1, u->jack_msgq);
if (!(u->client = jack_client_open(client_name, server_name ? JackServerName : JackNullOption, &status, server_name))) { if (!(u->client = jack_client_open(client_name, server_name ? JackServerName : JackNullOption, &status, server_name))) {
pa_log("jack_client_open() failed."); pa_log("jack_client_open() failed.");

8
src/modules/module-ladspa-sink.c
View file

@ -217,7 +217,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
} }
/* Called from I/O thread context */ /* Called from I/O thread context */
static void sink_input_rewind_cb(pa_sink_input *i, size_t nbytes) { static void sink_input_process_rewind_cb(pa_sink_input *i, size_t nbytes) {
struct userdata *u; struct userdata *u;
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
@ -228,7 +228,7 @@ static void sink_input_rewind_cb(pa_sink_input *i, size_t nbytes) {
} }
/* Called from I/O thread context */ /* Called from I/O thread context */
static void sink_input_set_max_rewind_cb(pa_sink_input *i, size_t nbytes) { static void sink_input_update_max_rewind_cb(pa_sink_input *i, size_t nbytes) {
struct userdata *u; struct userdata *u;
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
@ -650,8 +650,8 @@ int pa__init(pa_module*m) {
u->sink_input->parent.process_msg = sink_input_process_msg; u->sink_input->parent.process_msg = sink_input_process_msg;
u->sink_input->pop = sink_input_pop_cb; u->sink_input->pop = sink_input_pop_cb;
u->sink_input->rewind = sink_input_rewind_cb; u->sink_input->process_rewind = sink_input_process_rewind_cb;
u->sink_input->set_max_rewind = sink_input_set_max_rewind_cb; u->sink_input->update_max_rewind = sink_input_update_max_rewind_cb;
u->sink_input->kill = sink_input_kill_cb; u->sink_input->kill = sink_input_kill_cb;
u->sink_input->attach = sink_input_attach_cb; u->sink_input->attach = sink_input_attach_cb;
u->sink_input->detach = sink_input_detach_cb; u->sink_input->detach = sink_input_detach_cb;

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

@ -1234,9 +1234,8 @@ int pa__init(pa_module*m) {
u->in_nfrags = u->out_nfrags = u->nfrags = nfrags; u->in_nfrags = u->out_nfrags = u->nfrags = nfrags;
u->out_fragment_size = u->in_fragment_size = u->frag_size = frag_size; u->out_fragment_size = u->in_fragment_size = u->frag_size = frag_size;
u->use_mmap = use_mmap; u->use_mmap = use_mmap;
pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
u->rtpoll = pa_rtpoll_new(); u->rtpoll = pa_rtpoll_new();
pa_rtpoll_item_new_asyncmsgq(u->rtpoll, PA_RTPOLL_EARLY, u->thread_mq.inq); pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
u->rtpoll_item = NULL; u->rtpoll_item = NULL;
build_pollfd(u); build_pollfd(u);

10
src/modules/module-remap-sink.c
View file

@ -143,8 +143,6 @@ static int sink_input_process_msg(pa_msgobject *o, int code, void *data, int64_t
return pa_sink_input_process_msg(o, code, data, offset, chunk); return pa_sink_input_process_msg(o, code, data, offset, chunk);
} }
static void sink_input_rewind_cb(pa_sink_input *i, size_t nbytes);
/* Called from I/O thread context */ /* Called from I/O thread context */
static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk) { static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk) {
struct userdata *u; struct userdata *u;
@ -159,7 +157,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
} }
/* Called from I/O thread context */ /* Called from I/O thread context */
static void sink_input_rewind_cb(pa_sink_input *i, size_t nbytes) { static void sink_input_process_rewind_cb(pa_sink_input *i, size_t nbytes) {
struct userdata *u; struct userdata *u;
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
@ -170,7 +168,7 @@ static void sink_input_rewind_cb(pa_sink_input *i, size_t nbytes) {
} }
/* Called from I/O thread context */ /* Called from I/O thread context */
static void sink_input_set_max_rewind_cb(pa_sink_input *i, size_t nbytes) { static void sink_input_update_max_rewind_cb(pa_sink_input *i, size_t nbytes) {
struct userdata *u; struct userdata *u;
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
@ -321,8 +319,8 @@ int pa__init(pa_module*m) {
u->sink_input->parent.process_msg = sink_input_process_msg; u->sink_input->parent.process_msg = sink_input_process_msg;
u->sink_input->pop = sink_input_pop_cb; u->sink_input->pop = sink_input_pop_cb;
u->sink_input->rewind = sink_input_rewind_cb; u->sink_input->process_rewind = sink_input_process_rewind_cb;
u->sink_input->set_max_rewind = sink_input_set_max_rewind_cb; u->sink_input->update_max_rewind = sink_input_update_max_rewind_cb;
u->sink_input->kill = sink_input_kill_cb; u->sink_input->kill = sink_input_kill_cb;
u->sink_input->attach = sink_input_attach_cb; u->sink_input->attach = sink_input_attach_cb;
u->sink_input->detach = sink_input_detach_cb; u->sink_input->detach = sink_input_detach_cb;

3
src/modules/module-tunnel.c
View file

@ -1329,9 +1329,8 @@ int pa__init(pa_module*m) {
u->auth_cookie_in_property = FALSE; u->auth_cookie_in_property = FALSE;
u->time_event = NULL; u->time_event = NULL;
pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
u->rtpoll = pa_rtpoll_new(); u->rtpoll = pa_rtpoll_new();
pa_rtpoll_item_new_asyncmsgq(u->rtpoll, PA_RTPOLL_EARLY, u->thread_mq.inq); pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
if (load_key(u, pa_modargs_get_value(ma, "cookie", NULL)) < 0) if (load_key(u, pa_modargs_get_value(ma, "cookie", NULL)) < 0)
goto fail; goto fail;