diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c index c7dbe38c5..dde1e85b7 100644 --- a/src/gst/gstpipewiresink.c +++ b/src/gst/gstpipewiresink.c @@ -33,6 +33,8 @@ * */ +#define PW_ENABLE_DEPRECATED + #include "config.h" #include "gstpipewiresink.h" diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c index 4e37846fc..760245c33 100644 --- a/src/gst/gstpipewiresrc.c +++ b/src/gst/gstpipewiresrc.c @@ -33,6 +33,8 @@ * */ +#define PW_ENABLE_DEPRECATED + #include "config.h" #include "gstpipewiresrc.h" #include "gstpipewireformat.h" diff --git a/src/modules/module-client-node/v0/client-node.c b/src/modules/module-client-node/v0/client-node.c index 747a4ad4a..214c1bdfc 100644 --- a/src/modules/module-client-node/v0/client-node.c +++ b/src/modules/module-client-node/v0/client-node.c @@ -38,6 +38,8 @@ #include #include +#define PW_ENABLE_DEPRECATED + #include "pipewire/pipewire.h" #include "pipewire/private.h" diff --git a/src/pipewire/keys.h b/src/pipewire/keys.h index 8af9bbc7c..81c9c30e0 100644 --- a/src/pipewire/keys.h +++ b/src/pipewire/keys.h @@ -155,8 +155,6 @@ extern "C" { #define PW_KEY_NODE_EXCLUSIVE "node.exclusive" /**< node wants exclusive access to resources */ #define PW_KEY_NODE_AUTOCONNECT "node.autoconnect" /**< node wants to be automatically connected * to a compatible node */ -#define PW_KEY_NODE_TARGET "node.target" /**< node wants to be connected to the target - * node/session */ #define PW_KEY_NODE_LATENCY "node.latency" /**< the requested latency of the node as * a fraction. Ex: 128/48000 */ #define PW_KEY_NODE_MAX_LATENCY "node.max-latency" /**< the maximum supported latency of the @@ -173,9 +171,9 @@ extern "C" { * active */ #define PW_KEY_NODE_DONT_RECONNECT "node.dont-reconnect" /**< don't reconnect this node. The node is - * initially linked to node.target or - * target.object or the default node. If the - * targets is removed, the node is destroyed */ + * initially linked to target.object or the + * default node. If the target is removed, + * the node is destroyed */ #define PW_KEY_NODE_ALWAYS_PROCESS "node.always-process" /**< process even when unlinked */ #define PW_KEY_NODE_WANT_DRIVER "node.want-driver" /**< the node wants to be grouped with a driver * node in order to schedule the graph. */ @@ -338,9 +336,11 @@ extern "C" { #ifdef PW_ENABLE_DEPRECATED #define PW_KEY_PRIORITY_MASTER "priority.master" /**< deprecated */ +#define PW_KEY_NODE_TARGET "node.target" /**< deprecated since 0.3.64, use target.object. */ #endif /* PW_ENABLE_DEPRECATED */ -#define PW_KEY_TARGET_OBJECT "target.object" /**< a target object to link to */ +#define PW_KEY_TARGET_OBJECT "target.object" /**< a target object to link to. This can be + * and object name or object.serial */ /** \} */ diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c index cfd7bd15d..de2ce09e8 100644 --- a/src/pipewire/stream.c +++ b/src/pipewire/stream.c @@ -39,6 +39,8 @@ #include #include +#define PW_ENABLE_DEPRECATED + #include "pipewire/pipewire.h" #include "pipewire/stream.h" #include "pipewire/private.h" @@ -1890,6 +1892,7 @@ pw_stream_connect(struct pw_stream *stream, stream_set_state(stream, PW_STREAM_STATE_CONNECTING, NULL); if (target_id != PW_ID_ANY) + /* this is deprecated but still used by the portal and its apps */ pw_properties_setf(stream->properties, PW_KEY_NODE_TARGET, "%d", target_id); else if ((str = getenv("PIPEWIRE_NODE")) != NULL) pw_properties_set(stream->properties, PW_KEY_TARGET_OBJECT, str);