mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

combine-sink: Add a convenience variable

Browse source
This commit is contained in:
Tanu Kaskinen 2014-06-17 14:01:15 +03:00
parent ddec7e1080
commit 3d4a20adba
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/module-combine-sink.c
View file

@ -925,6 +925,7 @@ static void update_description(struct userdata *u) {
} }
static int output_create_sink_input(struct output *o) { static int output_create_sink_input(struct output *o) {
struct userdata *u;
pa_sink_input_new_data data; pa_sink_input_new_data data;
pa_assert(o); pa_assert(o);
@ -932,18 +933,20 @@ static int output_create_sink_input(struct output *o) {
if (o->sink_input) if (o->sink_input)
return 0; return 0;
u = o->userdata;
pa_sink_input_new_data_init(&data); pa_sink_input_new_data_init(&data);
pa_sink_input_new_data_set_sink(&data, o->sink, false); pa_sink_input_new_data_set_sink(&data, o->sink, false);
data.driver = __FILE__; data.driver = __FILE__;
pa_proplist_setf(data.proplist, PA_PROP_MEDIA_NAME, "Simultaneous output on %s", pa_strnull(pa_proplist_gets(o->sink->proplist, PA_PROP_DEVICE_DESCRIPTION))); pa_proplist_setf(data.proplist, PA_PROP_MEDIA_NAME, "Simultaneous output on %s", pa_strnull(pa_proplist_gets(o->sink->proplist, PA_PROP_DEVICE_DESCRIPTION)));
pa_proplist_sets(data.proplist, PA_PROP_MEDIA_ROLE, "filter"); pa_proplist_sets(data.proplist, PA_PROP_MEDIA_ROLE, "filter");
pa_sink_input_new_data_set_sample_spec(&data, &o->userdata->sink->sample_spec); pa_sink_input_new_data_set_sample_spec(&data, &u->sink->sample_spec);
pa_sink_input_new_data_set_channel_map(&data, &o->userdata->sink->channel_map); pa_sink_input_new_data_set_channel_map(&data, &u->sink->channel_map);
data.module = o->userdata->module; data.module = u->module;
data.resample_method = o->userdata->resample_method; data.resample_method = u->resample_method;
data.flags = PA_SINK_INPUT_VARIABLE_RATE|PA_SINK_INPUT_DONT_MOVE|PA_SINK_INPUT_NO_CREATE_ON_SUSPEND; data.flags = PA_SINK_INPUT_VARIABLE_RATE|PA_SINK_INPUT_DONT_MOVE|PA_SINK_INPUT_NO_CREATE_ON_SUSPEND;
pa_sink_input_new(&o->sink_input, o->userdata->core, &data); pa_sink_input_new(&o->sink_input, u->core, &data);
pa_sink_input_new_data_done(&data); pa_sink_input_new_data_done(&data);