mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules: use TARGET_OBJECT instead of NODE_TARGET

Browse source
This commit is contained in:
Wim Taymans 2022-07-11 13:52:35 +02:00
parent dedbf39ab5
commit de65fd442f
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -99,7 +99,8 @@
* playback.props = { * playback.props = {
* node.name = "playback.CM106_stereo_pair_2" * node.name = "playback.CM106_stereo_pair_2"
* audio.position = [ RL RR ] * audio.position = [ RL RR ]
* node.target = "alsa_output.usb-0d8c_USB_Sound_Device-00.analog-surround-71" * target.object = "alsa_output.usb-0d8c_USB_Sound_Device-00.analog-surround-71"
* node.dont-reconnect = true
* stream.dont-remix = true * stream.dont-remix = true
* node.passive = true * node.passive = true
* } * }

6
src/modules/module-pipe-tunnel.c
View file

@ -94,7 +94,7 @@
* - \ref PW_KEY_NODE_GROUP * - \ref PW_KEY_NODE_GROUP
* - \ref PW_KEY_NODE_VIRTUAL * - \ref PW_KEY_NODE_VIRTUAL
* - \ref PW_KEY_MEDIA_CLASS * - \ref PW_KEY_MEDIA_CLASS
* - \ref PW_KEY_NODE_TARGET to specify the remote name or id to link to * - \ref PW_KEY_TARGET_OBJECT to specify the remote name or serial id to link to
* *
* When not otherwise specified, the pipe will accept or produce a * When not otherwise specified, the pipe will accept or produce a
* 16 bits, stereo, 48KHz sample stream. * 16 bits, stereo, 48KHz sample stream.
@ -112,7 +112,7 @@
* #audio.rate=<sample rate> * #audio.rate=<sample rate>
* #audio.channels=<number of channels> * #audio.channels=<number of channels>
* #audio.position=<channel map> * #audio.position=<channel map>
* #node.target=<remote target node> * #target.object=<remote target node>
* stream.props = { * stream.props = {
* # extra sink properties * # extra sink properties
* } * }
@ -139,7 +139,7 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
"[ node.latency=<latency as fraction> ] " \ "[ node.latency=<latency as fraction> ] " \
"[ node.name=<name of the nodes> ] " \ "[ node.name=<name of the nodes> ] " \
"[ node.description=<description of the nodes> ] " \ "[ node.description=<description of the nodes> ] " \
"[ node.target=<remote node target name> ] " \ "[ target.object=<remote node target name> ] " \
"[ audio.format=<sample format> ] " \ "[ audio.format=<sample format> ] " \
"[ audio.rate=<sample rate> ] " \ "[ audio.rate=<sample rate> ] " \
"[ audio.channels=<number of channels> ] " \ "[ audio.channels=<number of channels> ] " \

8
src/modules/module-pulse-tunnel.c
View file

@ -90,7 +90,7 @@
* - \ref PW_KEY_NODE_GROUP * - \ref PW_KEY_NODE_GROUP
* - \ref PW_KEY_NODE_VIRTUAL * - \ref PW_KEY_NODE_VIRTUAL
* - \ref PW_KEY_MEDIA_CLASS * - \ref PW_KEY_MEDIA_CLASS
* - \ref PW_KEY_NODE_TARGET to specify the remote name or id to link to * - \ref PW_KEY_TARGET_OBJECT to specify the remote node.name or serial.id to link to
* *
* ## Example configuration of a virtual sink * ## Example configuration of a virtual sink
* *
@ -104,7 +104,7 @@
* #audio.rate=<sample rate> * #audio.rate=<sample rate>
* #audio.channels=<number of channels> * #audio.channels=<number of channels>
* #audio.position=<channel map> * #audio.position=<channel map>
* #node.target=<remote target node> * #target.object=<remote target name>
* stream.props = { * stream.props = {
* # extra sink properties * # extra sink properties
* } * }
@ -660,7 +660,9 @@ static int create_pulse_stream(struct impl *impl)
pa_stream_set_overflow_callback(impl->pa_stream, stream_overflow_cb, impl); pa_stream_set_overflow_callback(impl->pa_stream, stream_overflow_cb, impl);
pa_stream_set_latency_update_callback(impl->pa_stream, stream_latency_update_cb, impl); pa_stream_set_latency_update_callback(impl->pa_stream, stream_latency_update_cb, impl);
remote_node_target = pw_properties_get(impl->props, PW_KEY_NODE_TARGET); remote_node_target = pw_properties_get(impl->props, PW_KEY_TARGET_OBJECT);
if (remote_node_target == NULL)
remote_node_target = pw_properties_get(impl->props, PW_KEY_NODE_TARGET);
bufferattr.fragsize = (uint32_t) -1; bufferattr.fragsize = (uint32_t) -1;
bufferattr.minreq = (uint32_t) -1; bufferattr.minreq = (uint32_t) -1;