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

don't segfault when the master changes

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1875 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-09-20 22:01:58 +00:00
parent 3b2835d334
commit e205bb2555
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -394,8 +394,6 @@ static void create_master_rtpolls(struct userdata *u) {
u->master->sink->rtpoll,
PA_RTPOLL_EARLY+1, /* This one has a slightly lower priority than the normal message handling */
k->outq);
pa_log("1: %p now has rptoll item %p", k, k->outq_rtpoll_item);
}
}
@ -426,8 +424,6 @@ static void sink_input_attach_cb(pa_sink_input *i) {
pa_sink_input_assert_ref(i);
pa_assert_se(o = i->userdata);
pa_log("attaching %s", i->sink->name);
if (o->userdata->thread_info.master == o) {
create_master_rtpolls(o->userdata);
@ -636,6 +632,14 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
}
case SINK_MESSAGE_SET_MASTER:
if (u->thread_info.master && data != u->thread_info.master) {
if (u->thread_info.master->sink_input->thread_info.attached)
free_master_rtpolls(u);
}
if ((u->thread_info.master = data)) {
/* There's now a master, and we're being executed in
@ -645,12 +649,8 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
if (u->thread_info.master->sink_input->thread_info.attached)
create_master_rtpolls(u);
} else {
if (u->thread_info.master->sink_input->thread_info.attached)
free_master_rtpolls(u);
}
return 0;
case SINK_MESSAGE_ADD_OUTPUT: {
@ -667,20 +667,14 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
u->thread_info.master->sink->rtpoll,
PA_RTPOLL_EARLY+1, /* This one has a slightly lower priority than the normal message handling */
op->outq);
pa_log("2: %p now has rptoll item %p", op, op->outq_rtpoll_item);
}
pa_log("Added output %s", op->sink_input->sink->name);
return 0;
}
case SINK_MESSAGE_REMOVE_OUTPUT: {
struct output *op = data;
pa_log("Remove output %s", op->sink_input->sink->name);
PA_LLIST_REMOVE(struct output, u->thread_info.outputs, op);
/* Remove the q that leads from this output to the master output */