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

Merge commit 'coling/master'

Browse source
This commit is contained in:
Lennart Poettering 2009-03-02 16:28:08 +01:00
commit 7794108d17
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -487,7 +487,7 @@ static void sink_input_kill_cb(pa_sink_input *i) {
struct output *o; struct output *o;
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
pa_assert(o = i->userdata); pa_assert_se(o = i->userdata);
pa_module_unload_request(o->userdata->module, TRUE); pa_module_unload_request(o->userdata->module, TRUE);
output_free(o); output_free(o);

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

@ -163,7 +163,7 @@ static int jack_process(jack_nframes_t nframes, void *arg) {
pa_assert(u); pa_assert(u);
for (c = 0; c < u->channels; c++) for (c = 0; c < u->channels; c++)
pa_assert(buffer[c] = jack_port_get_buffer(u->port[c], nframes)); pa_assert_se(buffer[c] = jack_port_get_buffer(u->port[c], nframes));
/* We interleave the data and pass it on to the other RT thread */ /* We interleave the data and pass it on to the other RT thread */