mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

loopback: New modargs: sink_input_properties and source_output_properties.

Browse source 
The new modargs replace sink_input_name, sink_input_role,
source_output_name and source_output_role.
This commit is contained in:
Tanu Kaskinen 2011-09-06 20:33:42 +03:00 • committed by Colin Guthrie
parent d36a9df63c
commit badc32adb9
1 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/modules/module-loopback.c
View file

@ -53,10 +53,8 @@ PA_MODULE_USAGE(
"rate=<sample rate> " "rate=<sample rate> "
"channels=<number of channels> " "channels=<number of channels> "
"channel_map=<channel map> " "channel_map=<channel map> "
"sink_input_name=<custom name for the sink input> " "sink_input_properties=<proplist> "
"source_output_name=<custom name for the source output> " "source_output_properties=<proplist> "
"sink_input_role=<media.role for the sink input> "
"source_output_role=<media.role for the source output> "
"source_dont_move=<boolean> " "source_dont_move=<boolean> "
"sink_dont_move=<boolean> " "sink_dont_move=<boolean> "
"remix=<remix channels?> "); "remix=<remix channels?> ");
@ -114,10 +112,8 @@ static const char* const valid_modargs[] = {
"rate", "rate",
"channels", "channels",
"channel_map", "channel_map",
"sink_input_name", "sink_input_properties",
"source_output_name", "source_output_properties",
"sink_input_role",
"source_output_role",
"source_dont_move", "source_dont_move",
"sink_dont_move", "sink_dont_move",
"remix", "remix",
@ -704,18 +700,21 @@ int pa__init(pa_module *m) {
sink_input_data.module = m; sink_input_data.module = m;
pa_sink_input_new_data_set_sink(&sink_input_data, sink, FALSE); pa_sink_input_new_data_set_sink(&sink_input_data, sink, FALSE);
if ((n = pa_modargs_get_value(ma, "sink_input_name", NULL))) if (pa_modargs_get_proplist(ma, "sink_input_properties", sink_input_data.proplist, PA_UPDATE_REPLACE) < 0) {
pa_proplist_sets(sink_input_data.proplist, PA_PROP_MEDIA_NAME, n); pa_log("Failed to parse the sink_input_properties value.");
else pa_sink_input_new_data_done(&sink_input_data);
goto fail;
}
if (!pa_proplist_contains(sink_input_data.proplist, PA_PROP_MEDIA_NAME))
pa_proplist_setf(sink_input_data.proplist, PA_PROP_MEDIA_NAME, "Loopback from %s", pa_proplist_setf(sink_input_data.proplist, PA_PROP_MEDIA_NAME, "Loopback from %s",
pa_strnull(pa_proplist_gets(source->proplist, PA_PROP_DEVICE_DESCRIPTION))); pa_strnull(pa_proplist_gets(source->proplist, PA_PROP_DEVICE_DESCRIPTION)));
if ((n = pa_modargs_get_value(ma, "sink_input_role", NULL))) if (!pa_proplist_contains(sink_input_data.proplist, PA_PROP_MEDIA_ROLE))
pa_proplist_sets(sink_input_data.proplist, PA_PROP_MEDIA_ROLE, n);
else
pa_proplist_sets(sink_input_data.proplist, PA_PROP_MEDIA_ROLE, "abstract"); pa_proplist_sets(sink_input_data.proplist, PA_PROP_MEDIA_ROLE, "abstract");
if ((n = pa_proplist_gets(source->proplist, PA_PROP_DEVICE_ICON_NAME))) if (!pa_proplist_contains(sink_input_data.proplist, PA_PROP_MEDIA_ICON_NAME)
&& (n = pa_proplist_gets(source->proplist, PA_PROP_DEVICE_ICON_NAME)))
pa_proplist_sets(sink_input_data.proplist, PA_PROP_MEDIA_ICON_NAME, n); pa_proplist_sets(sink_input_data.proplist, PA_PROP_MEDIA_ICON_NAME, n);
pa_sink_input_new_data_set_sample_spec(&sink_input_data, &ss); pa_sink_input_new_data_set_sample_spec(&sink_input_data, &ss);
@ -756,18 +755,21 @@ int pa__init(pa_module *m) {
source_output_data.module = m; source_output_data.module = m;
pa_source_output_new_data_set_source(&source_output_data, source, FALSE); pa_source_output_new_data_set_source(&source_output_data, source, FALSE);
if ((n = pa_modargs_get_value(ma, "source_output_name", NULL))) if (pa_modargs_get_proplist(ma, "source_output_properties", source_output_data.proplist, PA_UPDATE_REPLACE) < 0) {
pa_proplist_sets(source_output_data.proplist, PA_PROP_MEDIA_NAME, n); pa_log("Failed to parse the source_output_properties value.");
else pa_source_output_new_data_done(&source_output_data);
goto fail;
}
if (!pa_proplist_contains(source_output_data.proplist, PA_PROP_MEDIA_NAME))
pa_proplist_setf(source_output_data.proplist, PA_PROP_MEDIA_NAME, "Loopback to %s", pa_proplist_setf(source_output_data.proplist, PA_PROP_MEDIA_NAME, "Loopback to %s",
pa_strnull(pa_proplist_gets(sink->proplist, PA_PROP_DEVICE_DESCRIPTION))); pa_strnull(pa_proplist_gets(sink->proplist, PA_PROP_DEVICE_DESCRIPTION)));
if ((n = pa_modargs_get_value(ma, "source_output_role", NULL))) if (!pa_proplist_contains(source_output_data.proplist, PA_PROP_MEDIA_ROLE))
pa_proplist_sets(source_output_data.proplist, PA_PROP_MEDIA_ROLE, n);
else
pa_proplist_sets(source_output_data.proplist, PA_PROP_MEDIA_ROLE, "abstract"); pa_proplist_sets(source_output_data.proplist, PA_PROP_MEDIA_ROLE, "abstract");
if ((n = pa_proplist_gets(sink->proplist, PA_PROP_DEVICE_ICON_NAME))) if (!pa_proplist_contains(source_output_data.proplist, PA_PROP_MEDIA_ICON_NAME)
&& (n = pa_proplist_gets(sink->proplist, PA_PROP_DEVICE_ICON_NAME)))
pa_proplist_sets(source_output_data.proplist, PA_PROP_MEDIA_ICON_NAME, n); pa_proplist_sets(source_output_data.proplist, PA_PROP_MEDIA_ICON_NAME, n);
pa_source_output_new_data_set_sample_spec(&source_output_data, &ss); pa_source_output_new_data_set_sample_spec(&source_output_data, &ss);