2019-12-09 16:35:15 +02:00
|
|
|
/* WirePlumber
|
|
|
|
|
*
|
|
|
|
|
* Copyright © 2019 Collabora Ltd.
|
|
|
|
|
* @author George Kiagiadakis <george.kiagiadakis@collabora.com>
|
|
|
|
|
*
|
|
|
|
|
* SPDX-License-Identifier: MIT
|
|
|
|
|
*/
|
|
|
|
|
|
2020-02-17 15:39:19 +02:00
|
|
|
/**
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
* SECTION: endpoint
|
|
|
|
|
* @title: PIpeWire Endpoint
|
2020-02-17 15:39:19 +02:00
|
|
|
*/
|
|
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
#include "spa/param/param.h"
|
2020-04-14 18:31:17 +03:00
|
|
|
#define G_LOG_DOMAIN "wp-endpoint"
|
|
|
|
|
|
2019-12-09 16:35:15 +02:00
|
|
|
#include "endpoint.h"
|
2020-05-29 09:30:36 +03:00
|
|
|
#include "node.h"
|
2020-03-20 14:45:17 +02:00
|
|
|
#include "session.h"
|
2020-11-16 10:35:50 +02:00
|
|
|
#include "object-manager.h"
|
2020-02-12 11:28:07 +02:00
|
|
|
#include "error.h"
|
2020-11-25 14:02:33 +02:00
|
|
|
#include "debug.h"
|
2019-12-09 16:35:15 +02:00
|
|
|
#include "wpenums.h"
|
2020-11-25 14:02:33 +02:00
|
|
|
#include "spa-type.h"
|
2020-04-11 11:05:26 +03:00
|
|
|
#include "si-factory.h"
|
2020-11-15 20:01:51 +02:00
|
|
|
#include "private/impl-endpoint.h"
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
#include "private/pipewire-object-mixin.h"
|
2019-12-09 16:35:15 +02:00
|
|
|
|
|
|
|
|
#include <pipewire/extensions/session-manager.h>
|
2020-03-20 14:45:17 +02:00
|
|
|
#include <pipewire/extensions/session-manager/introspect-funcs.h>
|
2020-11-25 14:02:33 +02:00
|
|
|
#include <spa/utils/result.h>
|
2020-03-20 14:45:17 +02:00
|
|
|
|
2020-06-02 10:56:28 +03:00
|
|
|
enum {
|
2020-11-25 14:02:33 +02:00
|
|
|
PROP_NAME = WP_PW_OBJECT_MIXIN_PROP_CUSTOM_START,
|
2020-06-02 10:56:28 +03:00
|
|
|
PROP_MEDIA_CLASS,
|
|
|
|
|
PROP_DIRECTION,
|
|
|
|
|
};
|
|
|
|
|
|
2020-05-03 19:42:42 +03:00
|
|
|
enum {
|
|
|
|
|
SIGNAL_STREAMS_CHANGED,
|
|
|
|
|
N_SIGNALS,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static guint32 signals[N_SIGNALS] = {0};
|
|
|
|
|
|
2020-02-12 11:28:07 +02:00
|
|
|
typedef struct _WpEndpointPrivate WpEndpointPrivate;
|
|
|
|
|
struct _WpEndpointPrivate
|
2019-12-09 16:35:15 +02:00
|
|
|
{
|
2020-03-31 15:14:45 +03:00
|
|
|
WpObjectManager *streams_om;
|
2019-12-09 16:35:15 +02:00
|
|
|
};
|
|
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
static void wp_endpoint_pw_object_mixin_priv_interface_init (
|
|
|
|
|
WpPwObjectMixinPrivInterface * iface);
|
2019-12-09 16:35:15 +02:00
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
/**
|
|
|
|
|
* WpEndpoint:
|
|
|
|
|
*
|
|
|
|
|
* The #WpEndpoint class allows accessing the properties and methods of a
|
|
|
|
|
* PipeWire endpoint object (`struct pw_endpoint` from the session-manager
|
|
|
|
|
* extension).
|
|
|
|
|
*
|
|
|
|
|
* A #WpEndpoint is constructed internally when a new endpoint appears on the
|
|
|
|
|
* PipeWire registry and it is made available through the #WpObjectManager API.
|
|
|
|
|
*/
|
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (WpEndpoint, wp_endpoint, WP_TYPE_GLOBAL_PROXY,
|
|
|
|
|
G_ADD_PRIVATE (WpEndpoint)
|
2020-11-25 14:02:33 +02:00
|
|
|
G_IMPLEMENT_INTERFACE (WP_TYPE_PIPEWIRE_OBJECT,
|
|
|
|
|
wp_pw_object_mixin_object_interface_init)
|
|
|
|
|
G_IMPLEMENT_INTERFACE (WP_TYPE_PW_OBJECT_MIXIN_PRIV,
|
|
|
|
|
wp_endpoint_pw_object_mixin_priv_interface_init))
|
2019-12-09 16:35:15 +02:00
|
|
|
|
|
|
|
|
static void
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_endpoint_init (WpEndpoint * self)
|
2019-12-09 16:35:15 +02:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2020-06-02 10:56:28 +03:00
|
|
|
static void
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_endpoint_get_property (GObject * object, guint property_id,
|
2020-06-02 10:56:28 +03:00
|
|
|
GValue * value, GParamSpec * pspec)
|
|
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
WpPwObjectMixinData *d = wp_pw_object_mixin_get_data (object);
|
2020-06-02 10:56:28 +03:00
|
|
|
|
|
|
|
|
switch (property_id) {
|
|
|
|
|
case PROP_NAME:
|
2020-11-25 14:02:33 +02:00
|
|
|
g_value_set_string (value, d->info ?
|
|
|
|
|
((struct pw_endpoint_info *) d->info)->name : NULL);
|
2020-06-02 10:56:28 +03:00
|
|
|
break;
|
|
|
|
|
case PROP_MEDIA_CLASS:
|
2020-11-25 14:02:33 +02:00
|
|
|
g_value_set_string (value, d->info ?
|
|
|
|
|
((struct pw_endpoint_info *) d->info)->media_class : NULL);
|
2020-06-02 10:56:28 +03:00
|
|
|
break;
|
|
|
|
|
case PROP_DIRECTION:
|
2020-11-25 14:02:33 +02:00
|
|
|
g_value_set_enum (value, d->info ?
|
|
|
|
|
((struct pw_endpoint_info *) d->info)->direction : 0);
|
2020-06-02 10:56:28 +03:00
|
|
|
break;
|
|
|
|
|
default:
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_pw_object_mixin_get_property (object, property_id, value, pspec);
|
2020-06-02 10:56:28 +03:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-31 15:14:45 +03:00
|
|
|
static void
|
2020-05-03 19:42:42 +03:00
|
|
|
wp_endpoint_on_streams_om_installed (WpObjectManager *streams_om,
|
|
|
|
|
WpEndpoint * self)
|
2020-03-31 15:14:45 +03:00
|
|
|
{
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_object_update_features (WP_OBJECT (self), WP_ENDPOINT_FEATURE_STREAMS, 0);
|
2020-03-31 15:14:45 +03:00
|
|
|
}
|
|
|
|
|
|
2020-05-03 19:42:42 +03:00
|
|
|
static void
|
|
|
|
|
wp_endpoint_emit_streams_changed (WpObjectManager *streams_om,
|
|
|
|
|
WpEndpoint * self)
|
|
|
|
|
{
|
|
|
|
|
g_signal_emit (self, signals[SIGNAL_STREAMS_CHANGED], 0);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_object_update_features (WP_OBJECT (self), WP_ENDPOINT_FEATURE_STREAMS, 0);
|
2020-05-03 19:42:42 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_endpoint_enable_feature_streams (WpEndpoint * self)
|
2020-05-03 19:42:42 +03:00
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
WpPwObjectMixinData *d = wp_pw_object_mixin_get_data (self);
|
2020-05-03 19:42:42 +03:00
|
|
|
WpEndpointPrivate *priv = wp_endpoint_get_instance_private (self);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_autoptr (WpCore) core = wp_object_get_core (WP_OBJECT (self));
|
|
|
|
|
guint32 bound_id = wp_proxy_get_bound_id (WP_PROXY (self));
|
2020-11-25 14:02:33 +02:00
|
|
|
guint32 n_streams = ((struct pw_endpoint_info *) d->info)->n_streams;
|
2020-05-03 19:42:42 +03:00
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_debug_object (self, "enabling WP_ENDPOINT_FEATURE_STREAMS, bound_id:%u, "
|
2020-11-25 14:02:33 +02:00
|
|
|
"n_streams:%u", bound_id, n_streams);
|
2020-05-03 19:42:42 +03:00
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
priv->streams_om = wp_object_manager_new ();
|
|
|
|
|
/* proxy endpoint stream -> check for endpoint.id in global properties */
|
|
|
|
|
wp_object_manager_add_interest (priv->streams_om,
|
|
|
|
|
WP_TYPE_ENDPOINT_STREAM,
|
|
|
|
|
WP_CONSTRAINT_TYPE_PW_GLOBAL_PROPERTY, PW_KEY_ENDPOINT_ID, "=u", bound_id,
|
|
|
|
|
NULL);
|
|
|
|
|
/* impl endpoint stream -> check for endpoint.id in standard properties */
|
|
|
|
|
wp_object_manager_add_interest (priv->streams_om,
|
|
|
|
|
WP_TYPE_IMPL_ENDPOINT_STREAM,
|
|
|
|
|
WP_CONSTRAINT_TYPE_PW_PROPERTY, PW_KEY_ENDPOINT_ID, "=u", bound_id,
|
|
|
|
|
NULL);
|
|
|
|
|
wp_object_manager_request_object_features (priv->streams_om,
|
|
|
|
|
WP_TYPE_ENDPOINT_STREAM, WP_OBJECT_FEATURES_ALL);
|
|
|
|
|
|
|
|
|
|
/* endpoints, under normal circumstances, always have streams.
|
|
|
|
|
When we export (self is a WpImplEndpoint), we have to export first
|
|
|
|
|
the endpoint and afterwards the streams (so that the streams can be
|
|
|
|
|
associated with the endpoint's bound id), but then the issue is that
|
|
|
|
|
the "installed" signal gets fired here without any streams being ready
|
|
|
|
|
and we get an endpoint with 0 streams in the WpSession's endpoints
|
|
|
|
|
object manager... so, unless the endpoint really has no streams,
|
|
|
|
|
wait for them to be prepared by waiting for the "objects-changed" only */
|
2020-11-25 14:02:33 +02:00
|
|
|
if (G_UNLIKELY (n_streams == 0)) {
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_signal_connect_object (priv->streams_om, "installed",
|
|
|
|
|
G_CALLBACK (wp_endpoint_on_streams_om_installed), self, 0);
|
2020-05-03 19:42:42 +03:00
|
|
|
}
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_signal_connect_object (priv->streams_om, "objects-changed",
|
|
|
|
|
G_CALLBACK (wp_endpoint_emit_streams_changed), self, 0);
|
|
|
|
|
|
|
|
|
|
wp_core_install_object_manager (core, priv->streams_om);
|
2020-05-03 19:42:42 +03:00
|
|
|
}
|
|
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
static WpObjectFeatures
|
|
|
|
|
wp_endpoint_get_supported_features (WpObject * object)
|
2019-12-09 16:35:15 +02:00
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
return wp_pw_object_mixin_get_supported_features(object)
|
|
|
|
|
| WP_ENDPOINT_FEATURE_STREAMS;
|
2019-12-09 16:35:15 +02:00
|
|
|
}
|
|
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
enum {
|
2020-11-25 14:02:33 +02:00
|
|
|
STEP_STREAMS = WP_PW_OBJECT_MIXIN_STEP_CUSTOM_START,
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wp_endpoint_activate_execute_step (WpObject * object,
|
|
|
|
|
WpFeatureActivationTransition * transition, guint step,
|
|
|
|
|
WpObjectFeatures missing)
|
2020-01-22 10:34:56 +02:00
|
|
|
{
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
switch (step) {
|
2020-11-25 14:02:33 +02:00
|
|
|
case WP_PW_OBJECT_MIXIN_STEP_BIND:
|
|
|
|
|
case WP_TRANSITION_STEP_ERROR:
|
|
|
|
|
/* base class can handle BIND and ERROR */
|
|
|
|
|
WP_OBJECT_CLASS (wp_endpoint_parent_class)->
|
|
|
|
|
activate_execute_step (object, transition, step, missing);
|
|
|
|
|
break;
|
|
|
|
|
case WP_PW_OBJECT_MIXIN_STEP_WAIT_INFO:
|
|
|
|
|
/* just wait, info will be emitted anyway after binding */
|
|
|
|
|
break;
|
|
|
|
|
case WP_PW_OBJECT_MIXIN_STEP_CACHE_PARAMS:
|
|
|
|
|
wp_pw_object_mixin_cache_params (object, missing);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
break;
|
|
|
|
|
case STEP_STREAMS:
|
|
|
|
|
wp_endpoint_enable_feature_streams (WP_ENDPOINT (object));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2020-11-25 14:02:33 +02:00
|
|
|
g_assert_not_reached ();
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
}
|
2020-01-22 10:34:56 +02:00
|
|
|
}
|
|
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
static void
|
|
|
|
|
wp_endpoint_deactivate (WpObject * object, WpObjectFeatures features)
|
2020-05-25 15:33:47 +03:00
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_pw_object_mixin_deactivate (object, features);
|
2020-05-25 15:33:47 +03:00
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
if (features & WP_ENDPOINT_FEATURE_STREAMS) {
|
2020-11-25 14:02:33 +02:00
|
|
|
WpEndpoint *self = WP_ENDPOINT (object);
|
|
|
|
|
WpEndpointPrivate *priv = wp_endpoint_get_instance_private (self);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_clear_object (&priv->streams_om);
|
|
|
|
|
wp_object_update_features (object, 0, WP_ENDPOINT_FEATURE_STREAMS);
|
|
|
|
|
}
|
2020-01-22 10:34:56 +02:00
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
WP_OBJECT_CLASS (wp_endpoint_parent_class)->deactivate (object, features);
|
2020-01-22 10:34:56 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct pw_endpoint_events endpoint_events = {
|
|
|
|
|
PW_VERSION_ENDPOINT_EVENTS,
|
2020-11-25 14:02:33 +02:00
|
|
|
.info = (HandleEventInfoFunc(endpoint)) wp_pw_object_mixin_handle_event_info,
|
|
|
|
|
.param = wp_pw_object_mixin_handle_event_param,
|
2020-01-22 10:34:56 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void
|
2020-02-12 11:28:07 +02:00
|
|
|
wp_endpoint_pw_proxy_created (WpProxy * proxy, struct pw_proxy * pw_proxy)
|
2020-01-22 10:34:56 +02:00
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_pw_object_mixin_handle_pw_proxy_created (proxy, pw_proxy,
|
|
|
|
|
endpoint, &endpoint_events);
|
2020-01-22 10:34:56 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-31 15:14:45 +03:00
|
|
|
static void
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_endpoint_pw_proxy_destroyed (WpProxy * proxy)
|
2020-03-31 15:14:45 +03:00
|
|
|
{
|
|
|
|
|
WpEndpoint *self = WP_ENDPOINT (proxy);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
WpEndpointPrivate *priv = wp_endpoint_get_instance_private (self);
|
|
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_pw_object_mixin_handle_pw_proxy_destroyed (proxy);
|
|
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_clear_object (&priv->streams_om);
|
|
|
|
|
wp_object_update_features (WP_OBJECT (proxy), 0,
|
2020-11-25 14:02:33 +02:00
|
|
|
WP_ENDPOINT_FEATURE_STREAMS);
|
2020-03-31 15:14:45 +03:00
|
|
|
}
|
|
|
|
|
|
2019-12-09 16:35:15 +02:00
|
|
|
static void
|
2020-02-12 11:28:07 +02:00
|
|
|
wp_endpoint_class_init (WpEndpointClass * klass)
|
2019-12-09 16:35:15 +02:00
|
|
|
{
|
|
|
|
|
GObjectClass *object_class = (GObjectClass *) klass;
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
WpObjectClass *wpobject_class = (WpObjectClass *) klass;
|
2019-12-09 16:35:15 +02:00
|
|
|
WpProxyClass *proxy_class = (WpProxyClass *) klass;
|
|
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
object_class->get_property = wp_endpoint_get_property;
|
|
|
|
|
|
|
|
|
|
wpobject_class->get_supported_features = wp_endpoint_get_supported_features;
|
2020-11-25 14:02:33 +02:00
|
|
|
wpobject_class->activate_get_next_step =
|
|
|
|
|
wp_pw_object_mixin_activate_get_next_step;
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wpobject_class->activate_execute_step = wp_endpoint_activate_execute_step;
|
|
|
|
|
wpobject_class->deactivate = wp_endpoint_deactivate;
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-01-30 17:41:25 +02:00
|
|
|
proxy_class->pw_iface_type = PW_TYPE_INTERFACE_Endpoint;
|
|
|
|
|
proxy_class->pw_iface_version = PW_VERSION_ENDPOINT;
|
2020-02-12 11:28:07 +02:00
|
|
|
proxy_class->pw_proxy_created = wp_endpoint_pw_proxy_created;
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
proxy_class->pw_proxy_destroyed = wp_endpoint_pw_proxy_destroyed;
|
|
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_pw_object_mixin_class_override_properties (object_class);
|
2020-02-12 11:28:07 +02:00
|
|
|
|
2020-05-03 19:42:42 +03:00
|
|
|
/**
|
|
|
|
|
* WpEndpoint::streams-changed:
|
|
|
|
|
* @self: the endpoint
|
|
|
|
|
*
|
|
|
|
|
* Emitted when the endpoints's streams change. This is only emitted
|
|
|
|
|
* when %WP_ENDPOINT_FEATURE_STREAMS is enabled.
|
|
|
|
|
*/
|
|
|
|
|
signals[SIGNAL_STREAMS_CHANGED] = g_signal_new (
|
|
|
|
|
"streams-changed", G_TYPE_FROM_CLASS (klass),
|
|
|
|
|
G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
|
2020-06-02 10:56:28 +03:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* WpEndpoint:name:
|
|
|
|
|
*
|
|
|
|
|
* The name of the endpoint
|
|
|
|
|
*/
|
|
|
|
|
g_object_class_install_property (object_class, PROP_NAME,
|
|
|
|
|
g_param_spec_string ("name", "name", "name", NULL,
|
|
|
|
|
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* WpEndpoint:media-class:
|
|
|
|
|
*
|
|
|
|
|
* The media class of the endpoint (ex. "Audio/Sink")
|
|
|
|
|
*/
|
|
|
|
|
g_object_class_install_property (object_class, PROP_MEDIA_CLASS,
|
|
|
|
|
g_param_spec_string ("media-class", "media-class", "media-class", NULL,
|
|
|
|
|
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* WpEndpoint:direction:
|
|
|
|
|
*
|
|
|
|
|
* The direction of the endpoint
|
|
|
|
|
*/
|
|
|
|
|
g_object_class_install_property (object_class, PROP_DIRECTION,
|
|
|
|
|
g_param_spec_enum ("direction", "direction", "direction",
|
|
|
|
|
WP_TYPE_DIRECTION, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
|
2019-12-09 16:35:15 +02:00
|
|
|
}
|
|
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
static gint
|
|
|
|
|
wp_endpoint_enum_params (gpointer instance, guint32 id,
|
|
|
|
|
guint32 start, guint32 num, WpSpaPod *filter)
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
WpPwObjectMixinData *d = wp_pw_object_mixin_get_data (instance);
|
|
|
|
|
return pw_endpoint_enum_params (d->iface, 0, id, start, num,
|
|
|
|
|
filter ? wp_spa_pod_get_spa_pod (filter) : NULL);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
}
|
|
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
static gint
|
|
|
|
|
wp_endpoint_set_param (gpointer instance, guint32 id, guint32 flags,
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
WpSpaPod * param)
|
|
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
WpPwObjectMixinData *d = wp_pw_object_mixin_get_data (instance);
|
|
|
|
|
return pw_endpoint_set_param (d->iface, id, flags,
|
|
|
|
|
wp_spa_pod_get_spa_pod (param));
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_endpoint_pw_object_mixin_priv_interface_init (
|
|
|
|
|
WpPwObjectMixinPrivInterface * iface)
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_pw_object_mixin_priv_interface_info_init (iface, endpoint, ENDPOINT);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
iface->enum_params = wp_endpoint_enum_params;
|
|
|
|
|
iface->set_param = wp_endpoint_set_param;
|
|
|
|
|
}
|
|
|
|
|
|
2020-02-17 15:39:19 +02:00
|
|
|
/**
|
|
|
|
|
* wp_endpoint_get_name:
|
|
|
|
|
* @self: the endpoint
|
|
|
|
|
*
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
* Requires %WP_PIPEWIRE_OBJECT_FEATURE_INFO
|
|
|
|
|
*
|
2020-02-17 15:39:19 +02:00
|
|
|
* Returns: the name of the endpoint
|
|
|
|
|
*/
|
2020-02-12 11:28:07 +02:00
|
|
|
const gchar *
|
|
|
|
|
wp_endpoint_get_name (WpEndpoint * self)
|
2019-12-09 16:35:15 +02:00
|
|
|
{
|
2020-02-12 11:28:07 +02:00
|
|
|
g_return_val_if_fail (WP_IS_ENDPOINT (self), NULL);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_return_val_if_fail (wp_object_get_active_features (WP_OBJECT (self)) &
|
|
|
|
|
WP_PIPEWIRE_OBJECT_FEATURE_INFO, NULL);
|
2020-02-12 11:28:07 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
WpPwObjectMixinData *d = wp_pw_object_mixin_get_data (self);
|
|
|
|
|
return ((struct pw_endpoint_info *) d->info)->name;
|
2019-12-09 16:35:15 +02:00
|
|
|
}
|
|
|
|
|
|
2020-02-17 15:39:19 +02:00
|
|
|
/**
|
|
|
|
|
* wp_endpoint_get_media_class:
|
|
|
|
|
* @self: the endpoint
|
|
|
|
|
*
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
* Requires %WP_PIPEWIRE_OBJECT_FEATURE_INFO
|
|
|
|
|
*
|
2020-02-17 15:39:19 +02:00
|
|
|
* Returns: the media class of the endpoint (ex. "Audio/Sink")
|
|
|
|
|
*/
|
2020-02-12 11:28:07 +02:00
|
|
|
const gchar *
|
|
|
|
|
wp_endpoint_get_media_class (WpEndpoint * self)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (WP_IS_ENDPOINT (self), NULL);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_return_val_if_fail (wp_object_get_active_features (WP_OBJECT (self)) &
|
|
|
|
|
WP_PIPEWIRE_OBJECT_FEATURE_INFO, NULL);
|
2020-02-12 11:28:07 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
WpPwObjectMixinData *d = wp_pw_object_mixin_get_data (self);
|
|
|
|
|
return ((struct pw_endpoint_info *) d->info)->media_class;
|
2020-02-12 11:28:07 +02:00
|
|
|
}
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-02-17 15:39:19 +02:00
|
|
|
/**
|
|
|
|
|
* wp_endpoint_get_direction:
|
|
|
|
|
* @self: the endpoint
|
|
|
|
|
*
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
* Requires %WP_PIPEWIRE_OBJECT_FEATURE_INFO
|
|
|
|
|
*
|
2020-02-17 15:39:19 +02:00
|
|
|
* Returns: the direction of this endpoint
|
|
|
|
|
*/
|
2020-02-12 11:28:07 +02:00
|
|
|
WpDirection
|
|
|
|
|
wp_endpoint_get_direction (WpEndpoint * self)
|
2019-12-09 16:35:15 +02:00
|
|
|
{
|
2020-02-12 11:28:07 +02:00
|
|
|
g_return_val_if_fail (WP_IS_ENDPOINT (self), 0);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_return_val_if_fail (wp_object_get_active_features (WP_OBJECT (self)) &
|
|
|
|
|
WP_PIPEWIRE_OBJECT_FEATURE_INFO, 0);
|
2020-02-12 11:28:07 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
WpPwObjectMixinData *d = wp_pw_object_mixin_get_data (self);
|
|
|
|
|
return (WpDirection) ((struct pw_endpoint_info *) d->info)->direction;
|
2020-02-12 11:28:07 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-31 15:14:45 +03:00
|
|
|
/**
|
|
|
|
|
* wp_endpoint_get_n_streams:
|
|
|
|
|
* @self: the endpoint
|
|
|
|
|
*
|
2020-05-05 12:17:08 +03:00
|
|
|
* Requires %WP_ENDPOINT_FEATURE_STREAMS
|
|
|
|
|
*
|
2020-03-31 15:14:45 +03:00
|
|
|
* Returns: the number of streams of this endpoint
|
|
|
|
|
*/
|
|
|
|
|
guint
|
|
|
|
|
wp_endpoint_get_n_streams (WpEndpoint * self)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (WP_IS_ENDPOINT (self), 0);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_return_val_if_fail (wp_object_get_active_features (WP_OBJECT (self)) &
|
2020-03-31 15:14:45 +03:00
|
|
|
WP_ENDPOINT_FEATURE_STREAMS, 0);
|
|
|
|
|
|
|
|
|
|
WpEndpointPrivate *priv = wp_endpoint_get_instance_private (self);
|
|
|
|
|
return wp_object_manager_get_n_objects (priv->streams_om);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
2020-05-05 12:17:08 +03:00
|
|
|
* wp_endpoint_iterate_streams:
|
2020-03-31 15:14:45 +03:00
|
|
|
* @self: the endpoint
|
|
|
|
|
*
|
2020-05-05 12:17:08 +03:00
|
|
|
* Requires %WP_ENDPOINT_FEATURE_STREAMS
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer full): a #WpIterator that iterates over all
|
|
|
|
|
* the endpoint streams that belong to this endpoint
|
2020-03-31 15:14:45 +03:00
|
|
|
*/
|
2020-05-05 12:17:08 +03:00
|
|
|
WpIterator *
|
|
|
|
|
wp_endpoint_iterate_streams (WpEndpoint * self)
|
2020-03-31 15:14:45 +03:00
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (WP_IS_ENDPOINT (self), NULL);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_return_val_if_fail (wp_object_get_active_features (WP_OBJECT (self)) &
|
2020-03-31 15:14:45 +03:00
|
|
|
WP_ENDPOINT_FEATURE_STREAMS, NULL);
|
|
|
|
|
|
|
|
|
|
WpEndpointPrivate *priv = wp_endpoint_get_instance_private (self);
|
2020-05-05 12:17:08 +03:00
|
|
|
return wp_object_manager_iterate (priv->streams_om);
|
2020-03-31 15:14:45 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
2020-05-05 12:17:08 +03:00
|
|
|
* wp_endpoint_iterate_streams_filtered:
|
|
|
|
|
* @self: the endpoint
|
|
|
|
|
* @...: a list of constraints, terminated by %NULL
|
|
|
|
|
*
|
|
|
|
|
* Requires %WP_ENDPOINT_FEATURE_STREAMS
|
|
|
|
|
*
|
|
|
|
|
* The constraints specified in the variable arguments must follow the rules
|
|
|
|
|
* documented in wp_object_interest_new().
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer full): a #WpIterator that iterates over all
|
|
|
|
|
* the streams that belong to this endpoint and match the constraints
|
|
|
|
|
*/
|
|
|
|
|
WpIterator *
|
|
|
|
|
wp_endpoint_iterate_streams_filtered (WpEndpoint * self, ...)
|
|
|
|
|
{
|
|
|
|
|
WpObjectInterest *interest;
|
|
|
|
|
va_list args;
|
|
|
|
|
va_start (args, self);
|
|
|
|
|
interest = wp_object_interest_new_valist (WP_TYPE_ENDPOINT_STREAM, &args);
|
|
|
|
|
va_end (args);
|
|
|
|
|
return wp_endpoint_iterate_streams_filtered_full (self, interest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* wp_endpoint_iterate_streams_filtered_full: (rename-to wp_endpoint_iterate_streams_filtered)
|
2020-03-31 15:14:45 +03:00
|
|
|
* @self: the endpoint
|
2020-05-05 12:17:08 +03:00
|
|
|
* @interest: (transfer full): the interest
|
|
|
|
|
*
|
|
|
|
|
* Requires %WP_ENDPOINT_FEATURE_STREAMS
|
2020-03-31 15:14:45 +03:00
|
|
|
*
|
2020-04-21 13:21:03 +03:00
|
|
|
* Returns: (transfer full): a #WpIterator that iterates over all
|
2020-05-05 12:17:08 +03:00
|
|
|
* the streams that belong to this endpoint and match the @interest
|
2020-03-31 15:14:45 +03:00
|
|
|
*/
|
2020-04-21 13:21:03 +03:00
|
|
|
WpIterator *
|
2020-05-05 12:17:08 +03:00
|
|
|
wp_endpoint_iterate_streams_filtered_full (WpEndpoint * self,
|
|
|
|
|
WpObjectInterest * interest)
|
2020-03-31 15:14:45 +03:00
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (WP_IS_ENDPOINT (self), NULL);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_return_val_if_fail (wp_object_get_active_features (WP_OBJECT (self)) &
|
2020-03-31 15:14:45 +03:00
|
|
|
WP_ENDPOINT_FEATURE_STREAMS, NULL);
|
|
|
|
|
|
|
|
|
|
WpEndpointPrivate *priv = wp_endpoint_get_instance_private (self);
|
2020-05-05 12:17:08 +03:00
|
|
|
return wp_object_manager_iterate_filtered_full (priv->streams_om, interest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* wp_endpoint_lookup_stream:
|
|
|
|
|
* @self: the endpoint
|
|
|
|
|
* @...: a list of constraints, terminated by %NULL
|
|
|
|
|
*
|
|
|
|
|
* Requires %WP_ENDPOINT_FEATURE_STREAMS
|
|
|
|
|
*
|
|
|
|
|
* The constraints specified in the variable arguments must follow the rules
|
|
|
|
|
* documented in wp_object_interest_new().
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer full) (nullable): the first stream that matches the
|
|
|
|
|
* constraints, or %NULL if there is no such stream
|
|
|
|
|
*/
|
|
|
|
|
WpEndpointStream *
|
|
|
|
|
wp_endpoint_lookup_stream (WpEndpoint * self, ...)
|
|
|
|
|
{
|
|
|
|
|
WpObjectInterest *interest;
|
|
|
|
|
va_list args;
|
|
|
|
|
va_start (args, self);
|
|
|
|
|
interest = wp_object_interest_new_valist (WP_TYPE_ENDPOINT_STREAM, &args);
|
|
|
|
|
va_end (args);
|
|
|
|
|
return wp_endpoint_lookup_stream_full (self, interest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* wp_endpoint_lookup_stream_full: (rename-to wp_endpoint_lookup_stream)
|
|
|
|
|
* @self: the endpoint
|
|
|
|
|
* @interest: (transfer full): the interest
|
|
|
|
|
*
|
|
|
|
|
* Requires %WP_ENDPOINT_FEATURE_STREAMS
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer full) (nullable): the first stream that matches the
|
|
|
|
|
* @interest, or %NULL if there is no such stream
|
|
|
|
|
*/
|
|
|
|
|
WpEndpointStream *
|
|
|
|
|
wp_endpoint_lookup_stream_full (WpEndpoint * self, WpObjectInterest * interest)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (WP_IS_ENDPOINT (self), NULL);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_return_val_if_fail (wp_object_get_active_features (WP_OBJECT (self)) &
|
2020-05-05 12:17:08 +03:00
|
|
|
WP_ENDPOINT_FEATURE_STREAMS, NULL);
|
|
|
|
|
|
|
|
|
|
WpEndpointPrivate *priv = wp_endpoint_get_instance_private (self);
|
|
|
|
|
return (WpEndpointStream *)
|
|
|
|
|
wp_object_manager_lookup_full (priv->streams_om, interest);
|
2020-03-31 15:14:45 +03:00
|
|
|
}
|
|
|
|
|
|
2020-05-05 10:19:41 +03:00
|
|
|
/**
|
|
|
|
|
* wp_endpoint_create_link:
|
|
|
|
|
* @self: the endpoint
|
|
|
|
|
* @props: the link properties
|
|
|
|
|
*
|
|
|
|
|
* Creates a #WpEndpointLink between @self and another endpoint, which
|
|
|
|
|
* must be specified in @props.
|
|
|
|
|
* @props may contain:
|
|
|
|
|
* - `endpoint-link.output.endpoint`: the bound id of the endpoint
|
|
|
|
|
* that is in the %WP_DIRECTION_OUTPUT direction
|
|
|
|
|
* - `endpoint-link.output.stream`: the bound id of the endpoint stream
|
|
|
|
|
* that is in the %WP_DIRECTION_OUTPUT direction
|
|
|
|
|
* - `endpoint-link.input.endpoint`: the bound id of the endpoint
|
|
|
|
|
* that is in the %WP_DIRECTION_INPUT direction
|
|
|
|
|
* - `endpoint-link.input.stream`: the bound id of the endpoint stream
|
|
|
|
|
* that is in the %WP_DIRECTION_INPUT direction
|
|
|
|
|
*
|
|
|
|
|
* If either stream id are not specified (or set to -1), then the first
|
|
|
|
|
* available stream of this endpoint is used for the link.
|
|
|
|
|
*
|
|
|
|
|
* The id of @self is not necessary to be specified, so only one of
|
|
|
|
|
* `endpoint-link.output.endpoint`, `endpoint-link.input.endpoint`
|
|
|
|
|
* is actually required.
|
|
|
|
|
*/
|
|
|
|
|
void
|
|
|
|
|
wp_endpoint_create_link (WpEndpoint * self, WpProperties * props)
|
|
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
WpPwObjectMixinData *d = wp_pw_object_mixin_get_data (self);
|
2020-05-05 10:19:41 +03:00
|
|
|
int res;
|
|
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
res = pw_endpoint_create_link (d->iface, wp_properties_peek_dict (props));
|
2020-05-05 10:19:41 +03:00
|
|
|
if (res < 0) {
|
|
|
|
|
wp_warning_object (self, "pw_endpoint_create_link: %d: %s", res,
|
|
|
|
|
spa_strerror (res));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-02-12 11:28:07 +02:00
|
|
|
/* WpImplEndpoint */
|
|
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
enum {
|
|
|
|
|
IMPL_PROP_0,
|
|
|
|
|
IMPL_PROP_ITEM,
|
2019-12-09 16:35:15 +02:00
|
|
|
};
|
|
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
struct _WpImplEndpoint
|
2019-12-09 16:35:15 +02:00
|
|
|
{
|
2020-03-20 14:45:17 +02:00
|
|
|
WpEndpoint parent;
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
struct spa_interface iface;
|
|
|
|
|
struct pw_endpoint_info info;
|
2020-11-25 14:02:33 +02:00
|
|
|
WpProperties *immutable_props;
|
2020-02-12 11:28:07 +02:00
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
WpSiEndpoint *item;
|
|
|
|
|
};
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
static void wp_endpoint_impl_pw_object_mixin_priv_interface_init (
|
|
|
|
|
WpPwObjectMixinPrivInterface * iface);
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
G_DEFINE_TYPE_WITH_CODE (WpImplEndpoint, wp_impl_endpoint, WP_TYPE_ENDPOINT,
|
|
|
|
|
G_IMPLEMENT_INTERFACE (WP_TYPE_PW_OBJECT_MIXIN_PRIV,
|
|
|
|
|
wp_endpoint_impl_pw_object_mixin_priv_interface_init))
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
static struct spa_param_info impl_param_info[] = {
|
|
|
|
|
SPA_PARAM_INFO (SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE),
|
|
|
|
|
SPA_PARAM_INFO (SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ)
|
|
|
|
|
};
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-04-11 11:05:26 +03:00
|
|
|
static void
|
|
|
|
|
on_si_link_exported (WpSessionItem * link, GAsyncResult * res, gpointer data)
|
|
|
|
|
{
|
2020-04-14 18:31:17 +03:00
|
|
|
WpImplEndpoint *self = WP_IMPL_ENDPOINT (data);
|
2020-04-11 11:05:26 +03:00
|
|
|
g_autoptr (GError) error = NULL;
|
|
|
|
|
|
|
|
|
|
if (!wp_session_item_export_finish (link, res, &error)) {
|
2020-04-14 18:31:17 +03:00
|
|
|
wp_warning_object (self, "failed to export link: %s", error->message);
|
2020-04-11 11:05:26 +03:00
|
|
|
g_object_unref (link);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
static int
|
|
|
|
|
impl_create_link (void *object, const struct spa_dict *props)
|
|
|
|
|
{
|
2020-04-11 11:05:26 +03:00
|
|
|
WpImplEndpoint *self = WP_IMPL_ENDPOINT (object);
|
|
|
|
|
const gchar *self_ep, *self_stream, *peer_ep, *peer_stream;
|
|
|
|
|
guint32 self_ep_id, self_stream_id, peer_ep_id, peer_stream_id;
|
2020-04-14 15:18:44 +03:00
|
|
|
WpSiStream *self_si_stream = NULL;
|
2020-04-11 11:05:26 +03:00
|
|
|
g_autoptr (WpSiStream) peer_si_stream = NULL;
|
|
|
|
|
g_autoptr (WpSession) session = NULL;
|
2020-05-05 16:31:53 +03:00
|
|
|
g_autoptr (WpEndpointStream) self_stream_proxy = NULL;
|
|
|
|
|
g_autoptr (WpEndpoint) peer_ep_proxy = NULL;
|
|
|
|
|
g_autoptr (WpEndpointStream) peer_stream_proxy = NULL;
|
2020-04-11 11:05:26 +03:00
|
|
|
|
|
|
|
|
/* find the session */
|
|
|
|
|
session = wp_session_item_get_associated_proxy (
|
|
|
|
|
WP_SESSION_ITEM (self->item), WP_TYPE_SESSION);
|
2020-05-05 16:31:53 +03:00
|
|
|
g_return_val_if_fail (session, -ENAVAIL);
|
2020-04-11 11:05:26 +03:00
|
|
|
|
|
|
|
|
if (self->info.direction == PW_DIRECTION_OUTPUT) {
|
|
|
|
|
self_ep = spa_dict_lookup (props, PW_KEY_ENDPOINT_LINK_OUTPUT_ENDPOINT);
|
|
|
|
|
self_stream = spa_dict_lookup (props, PW_KEY_ENDPOINT_LINK_OUTPUT_STREAM);
|
|
|
|
|
peer_ep = spa_dict_lookup (props, PW_KEY_ENDPOINT_LINK_INPUT_ENDPOINT);
|
|
|
|
|
peer_stream = spa_dict_lookup (props, PW_KEY_ENDPOINT_LINK_INPUT_STREAM);
|
|
|
|
|
} else {
|
|
|
|
|
self_ep = spa_dict_lookup (props, PW_KEY_ENDPOINT_LINK_INPUT_ENDPOINT);
|
|
|
|
|
self_stream = spa_dict_lookup (props, PW_KEY_ENDPOINT_LINK_INPUT_STREAM);
|
|
|
|
|
peer_ep = spa_dict_lookup (props, PW_KEY_ENDPOINT_LINK_OUTPUT_ENDPOINT);
|
|
|
|
|
peer_stream = spa_dict_lookup (props, PW_KEY_ENDPOINT_LINK_OUTPUT_STREAM);
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-05 16:31:53 +03:00
|
|
|
wp_debug_object (self, "requested link between %s:%s [self] & %s:%s [peer]",
|
|
|
|
|
self_ep, self_stream, peer_ep, peer_stream);
|
|
|
|
|
|
2020-04-11 11:05:26 +03:00
|
|
|
/* verify arguments */
|
|
|
|
|
if (!peer_ep) {
|
2020-04-14 18:31:17 +03:00
|
|
|
wp_warning_object (self,
|
|
|
|
|
"a peer endpoint must be specified at the very least");
|
2020-04-11 11:05:26 +03:00
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
if (self_ep && ((guint32) atoi (self_ep))
|
|
|
|
|
!= wp_proxy_get_bound_id (WP_PROXY (self))) {
|
2020-04-14 18:31:17 +03:00
|
|
|
wp_warning_object (self,
|
|
|
|
|
"creating links for other endpoints is now allowed");
|
2020-04-11 11:05:26 +03:00
|
|
|
return -EACCES;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* convert to int - allow unspecified streams */
|
|
|
|
|
self_ep_id = wp_proxy_get_bound_id (WP_PROXY (self));
|
2020-12-20 22:14:00 +02:00
|
|
|
self_stream_id = self_stream ? (guint32) atoi (self_stream) : SPA_ID_INVALID;
|
|
|
|
|
peer_ep_id = (guint32) atoi (peer_ep);
|
|
|
|
|
peer_stream_id = peer_stream ? (guint32) atoi (peer_stream) : SPA_ID_INVALID;
|
2020-04-11 11:05:26 +03:00
|
|
|
|
|
|
|
|
/* find our stream */
|
|
|
|
|
if (self_stream_id != SPA_ID_INVALID) {
|
|
|
|
|
WpSiStream *tmp;
|
|
|
|
|
guint32 tmp_id;
|
|
|
|
|
|
|
|
|
|
for (guint i = 0; i < wp_si_endpoint_get_n_streams (self->item); i++) {
|
|
|
|
|
tmp = wp_si_endpoint_get_stream (self->item, i);
|
|
|
|
|
tmp_id = wp_session_item_get_associated_proxy_id (WP_SESSION_ITEM (tmp),
|
|
|
|
|
WP_TYPE_ENDPOINT_STREAM);
|
|
|
|
|
|
|
|
|
|
if (tmp_id == self_stream_id) {
|
|
|
|
|
self_si_stream = tmp;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
self_si_stream = wp_si_endpoint_get_stream (self->item, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!self_si_stream) {
|
2020-04-14 18:31:17 +03:00
|
|
|
wp_warning_object (self, "stream %d not found in %d", self_stream_id,
|
|
|
|
|
self_ep_id);
|
2020-04-11 11:05:26 +03:00
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-05 16:31:53 +03:00
|
|
|
self_stream_proxy = wp_session_item_get_associated_proxy (
|
|
|
|
|
WP_SESSION_ITEM (self_si_stream), WP_TYPE_ENDPOINT_STREAM);
|
2020-04-11 11:05:26 +03:00
|
|
|
|
2020-05-05 16:31:53 +03:00
|
|
|
/* find the peer stream */
|
|
|
|
|
peer_ep_proxy = wp_session_lookup_endpoint (session,
|
|
|
|
|
WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", peer_ep_id, NULL);
|
|
|
|
|
if (!peer_ep_proxy) {
|
|
|
|
|
wp_warning_object (self, "endpoint %d not found in session", peer_ep_id);
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
2020-04-11 11:05:26 +03:00
|
|
|
|
2020-05-05 16:31:53 +03:00
|
|
|
if (peer_stream_id != SPA_ID_INVALID) {
|
|
|
|
|
peer_stream_proxy = wp_endpoint_lookup_stream (peer_ep_proxy,
|
|
|
|
|
WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", peer_stream_id, NULL);
|
|
|
|
|
} else {
|
|
|
|
|
peer_stream_proxy = wp_endpoint_lookup_stream (peer_ep_proxy, NULL);
|
|
|
|
|
}
|
2020-04-11 11:05:26 +03:00
|
|
|
|
2020-05-05 16:31:53 +03:00
|
|
|
if (!peer_stream_proxy) {
|
|
|
|
|
wp_warning_object (self, "stream %d not found in %d", peer_stream_id,
|
|
|
|
|
peer_ep_id);
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
2020-04-11 11:05:26 +03:00
|
|
|
|
2020-05-05 16:31:53 +03:00
|
|
|
if (!WP_IS_IMPL_ENDPOINT_STREAM (peer_stream_proxy)) {
|
|
|
|
|
/* TODO - if the stream is not implemented by our session manager,
|
|
|
|
|
we can still make things work by calling the peer endpoint's
|
|
|
|
|
create_link() and negotiating ports, while creating a dummy
|
|
|
|
|
WpSiEndpoint / WpSiStream on our end to satisfy the API */
|
|
|
|
|
return -ENAVAIL;
|
2020-04-11 11:05:26 +03:00
|
|
|
}
|
|
|
|
|
|
2020-05-05 16:31:53 +03:00
|
|
|
g_object_get (peer_stream_proxy, "item", &peer_si_stream, NULL);
|
|
|
|
|
|
|
|
|
|
wp_info_object (self, "creating endpoint link between "
|
|
|
|
|
"%s|%s " WP_OBJECT_FORMAT ", %s|%s " WP_OBJECT_FORMAT,
|
|
|
|
|
wp_endpoint_get_name (WP_ENDPOINT (self)),
|
|
|
|
|
wp_endpoint_stream_get_name (self_stream_proxy),
|
|
|
|
|
WP_OBJECT_ARGS (self_si_stream),
|
|
|
|
|
wp_endpoint_get_name (peer_ep_proxy),
|
|
|
|
|
wp_endpoint_stream_get_name (peer_stream_proxy),
|
|
|
|
|
WP_OBJECT_ARGS (peer_si_stream));
|
|
|
|
|
|
2020-04-11 11:05:26 +03:00
|
|
|
/* create the link */
|
|
|
|
|
{
|
|
|
|
|
g_autoptr (WpSessionItem) link = NULL;
|
|
|
|
|
g_autoptr (WpCore) core = NULL;
|
|
|
|
|
GVariantBuilder b;
|
|
|
|
|
guint64 out_stream_i, in_stream_i;
|
|
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
core = wp_object_get_core (WP_OBJECT (self));
|
2020-04-11 11:05:26 +03:00
|
|
|
link = wp_session_item_make (core, "si-standard-link");
|
|
|
|
|
if (!link) {
|
2020-04-14 18:31:17 +03:00
|
|
|
wp_warning_object (self, "si-standard-link factory is not available");
|
2020-04-11 11:05:26 +03:00
|
|
|
return -ENAVAIL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (self->info.direction == PW_DIRECTION_OUTPUT) {
|
|
|
|
|
out_stream_i = (guint64) self_si_stream;
|
|
|
|
|
in_stream_i = (guint64) peer_si_stream;
|
|
|
|
|
} else {
|
|
|
|
|
out_stream_i = (guint64) peer_si_stream;
|
|
|
|
|
in_stream_i = (guint64) self_si_stream;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
|
|
|
|
|
g_variant_builder_add (&b, "{sv}", "out-stream",
|
|
|
|
|
g_variant_new_uint64 (out_stream_i));
|
|
|
|
|
g_variant_builder_add (&b, "{sv}", "in-stream",
|
|
|
|
|
g_variant_new_uint64 (in_stream_i));
|
2020-05-07 16:38:14 +03:00
|
|
|
g_variant_builder_add (&b, "{sv}", "manage-lifetime",
|
|
|
|
|
g_variant_new_boolean (TRUE));
|
2020-04-14 18:31:17 +03:00
|
|
|
if (G_UNLIKELY (!wp_session_item_configure (link, g_variant_builder_end (&b)))) {
|
|
|
|
|
g_critical ("si-standard-link configuration failed");
|
2020-04-11 11:05:26 +03:00
|
|
|
return -ENAVAIL;
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-14 15:18:44 +03:00
|
|
|
wp_session_item_export (link, session,
|
|
|
|
|
(GAsyncReadyCallback) on_si_link_exported, self);
|
2020-04-11 11:05:26 +03:00
|
|
|
link = NULL;
|
|
|
|
|
}
|
2020-04-14 15:18:44 +03:00
|
|
|
|
|
|
|
|
return 0;
|
2020-03-20 14:45:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct pw_endpoint_methods impl_endpoint = {
|
|
|
|
|
PW_VERSION_ENDPOINT_METHODS,
|
2020-11-25 14:02:33 +02:00
|
|
|
.add_listener =
|
|
|
|
|
(ImplAddListenerFunc(endpoint)) wp_pw_object_mixin_impl_add_listener,
|
|
|
|
|
.subscribe_params = wp_pw_object_mixin_impl_subscribe_params,
|
|
|
|
|
.enum_params = wp_pw_object_mixin_impl_enum_params,
|
|
|
|
|
.set_param = wp_pw_object_mixin_impl_set_param,
|
2020-03-20 14:45:17 +02:00
|
|
|
.create_link = impl_create_link,
|
2019-12-09 16:35:15 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_impl_endpoint_init (WpImplEndpoint * self)
|
2020-02-12 11:28:07 +02:00
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
WpPwObjectMixinData *d = wp_pw_object_mixin_get_data (self);
|
2019-12-11 23:43:13 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
self->iface = SPA_INTERFACE_INIT (
|
|
|
|
|
PW_TYPE_INTERFACE_Endpoint,
|
|
|
|
|
PW_VERSION_ENDPOINT,
|
|
|
|
|
&impl_endpoint, self);
|
2019-12-11 23:43:13 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
d->info = &self->info;
|
|
|
|
|
d->iface = &self->iface;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
populate_properties (WpImplEndpoint * self)
|
|
|
|
|
{
|
|
|
|
|
WpPwObjectMixinData *d = wp_pw_object_mixin_get_data (self);
|
|
|
|
|
|
|
|
|
|
g_clear_pointer (&d->properties, wp_properties_unref);
|
|
|
|
|
d->properties = wp_si_endpoint_get_properties (self->item);
|
|
|
|
|
if (!d->properties)
|
|
|
|
|
d->properties = wp_properties_new_empty ();
|
|
|
|
|
d->properties = wp_properties_ensure_unique_owner (d->properties);
|
|
|
|
|
wp_properties_update (d->properties, self->immutable_props);
|
|
|
|
|
|
|
|
|
|
self->info.props = (struct spa_dict *) wp_properties_peek_dict (d->properties);
|
2019-12-11 23:43:13 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
static void
|
|
|
|
|
on_si_endpoint_properties_changed (WpSiEndpoint * item, WpImplEndpoint * self)
|
2019-12-09 16:35:15 +02:00
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
populate_properties (self);
|
|
|
|
|
wp_pw_object_mixin_notify_info (self, PW_ENDPOINT_CHANGE_MASK_PROPS);
|
|
|
|
|
}
|
2020-03-31 14:48:48 +03:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
static void
|
|
|
|
|
on_node_params_changed (WpNode * node, guint32 param_id, WpImplEndpoint * self)
|
|
|
|
|
{
|
|
|
|
|
if (param_id == SPA_PARAM_PropInfo || param_id == SPA_PARAM_Props)
|
|
|
|
|
wp_pw_object_mixin_notify_params_changed (self, param_id);
|
2019-12-09 16:35:15 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
static void
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_impl_endpoint_constructed (GObject * object)
|
2019-12-09 16:35:15 +02:00
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
WpImplEndpoint *self = WP_IMPL_ENDPOINT (object);
|
|
|
|
|
g_autoptr (GVariant) info = NULL;
|
|
|
|
|
g_autoptr (GVariantIter) immutable_props = NULL;
|
|
|
|
|
g_autoptr (WpObject) node = NULL;
|
|
|
|
|
const gchar *key, *value;
|
|
|
|
|
guchar direction;
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
self->info.version = PW_VERSION_ENDPOINT_INFO;
|
|
|
|
|
|
|
|
|
|
info = wp_si_endpoint_get_registration_info (self->item);
|
|
|
|
|
g_variant_get (info, "(ssya{ss})", &self->info.name,
|
|
|
|
|
&self->info.media_class, &direction, &immutable_props);
|
|
|
|
|
|
|
|
|
|
self->info.direction = (enum pw_direction) direction;
|
|
|
|
|
self->info.n_streams = wp_si_endpoint_get_n_streams (self->item);
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
/* associate with the session */
|
|
|
|
|
self->info.session_id = wp_session_item_get_associated_proxy_id (
|
|
|
|
|
WP_SESSION_ITEM (self->item), WP_TYPE_SESSION);
|
|
|
|
|
|
|
|
|
|
/* construct export properties (these will come back through
|
|
|
|
|
the registry and appear in wp_proxy_get_global_properties) */
|
|
|
|
|
self->immutable_props = wp_properties_new (
|
|
|
|
|
PW_KEY_ENDPOINT_NAME, self->info.name,
|
|
|
|
|
PW_KEY_MEDIA_CLASS, self->info.media_class,
|
|
|
|
|
NULL);
|
|
|
|
|
wp_properties_setf (self->immutable_props, PW_KEY_SESSION_ID,
|
|
|
|
|
"%d", self->info.session_id);
|
|
|
|
|
|
|
|
|
|
/* populate immutable (global) properties */
|
|
|
|
|
while (g_variant_iter_next (immutable_props, "{&s&s}", &key, &value))
|
|
|
|
|
wp_properties_set (self->immutable_props, key, value);
|
|
|
|
|
|
|
|
|
|
/* populate standard properties */
|
|
|
|
|
populate_properties (self);
|
|
|
|
|
|
|
|
|
|
/* subscribe to changes */
|
|
|
|
|
g_signal_connect_object (self->item, "endpoint-properties-changed",
|
|
|
|
|
G_CALLBACK (on_si_endpoint_properties_changed), self, 0);
|
|
|
|
|
|
|
|
|
|
/* if the item has a node, proxy its ParamProps */
|
|
|
|
|
node = wp_session_item_get_associated_proxy (
|
|
|
|
|
WP_SESSION_ITEM (self->item), WP_TYPE_NODE);
|
|
|
|
|
if (node && (wp_object_get_active_features (node) &
|
|
|
|
|
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS)) {
|
|
|
|
|
self->info.params = impl_param_info;
|
|
|
|
|
self->info.n_params = G_N_ELEMENTS (impl_param_info);
|
|
|
|
|
|
|
|
|
|
g_signal_connect_object (node, "params-changed",
|
|
|
|
|
G_CALLBACK (on_node_params_changed), self, 0);
|
|
|
|
|
|
|
|
|
|
wp_object_update_features (WP_OBJECT (self),
|
|
|
|
|
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS, 0);
|
|
|
|
|
} else {
|
|
|
|
|
self->info.params = NULL;
|
|
|
|
|
self->info.n_params = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wp_object_update_features (WP_OBJECT (self),
|
|
|
|
|
WP_PIPEWIRE_OBJECT_FEATURE_INFO, 0);
|
|
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (wp_impl_endpoint_parent_class)->constructed (object);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wp_impl_endpoint_dispose (GObject * object)
|
|
|
|
|
{
|
|
|
|
|
WpImplEndpoint *self = WP_IMPL_ENDPOINT (object);
|
|
|
|
|
|
|
|
|
|
g_clear_pointer (&self->immutable_props, wp_properties_unref);
|
|
|
|
|
g_clear_pointer (&self->info.name, g_free);
|
|
|
|
|
|
|
|
|
|
wp_object_update_features (WP_OBJECT (self), 0,
|
|
|
|
|
WP_PIPEWIRE_OBJECT_FEATURE_INFO |
|
|
|
|
|
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS);
|
|
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (wp_impl_endpoint_parent_class)->dispose (object);
|
2019-12-09 16:35:15 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
static void
|
|
|
|
|
wp_impl_endpoint_set_property (GObject * object, guint property_id,
|
|
|
|
|
const GValue * value, GParamSpec * pspec)
|
2019-12-09 16:35:15 +02:00
|
|
|
{
|
2020-03-20 14:45:17 +02:00
|
|
|
WpImplEndpoint *self = WP_IMPL_ENDPOINT (object);
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
switch (property_id) {
|
|
|
|
|
case IMPL_PROP_ITEM:
|
|
|
|
|
self->item = g_value_get_object (value);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2019-12-09 16:35:15 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
static void
|
|
|
|
|
wp_impl_endpoint_get_property (GObject * object, guint property_id,
|
|
|
|
|
GValue * value, GParamSpec * pspec)
|
2019-12-09 16:35:15 +02:00
|
|
|
{
|
2020-03-20 14:45:17 +02:00
|
|
|
WpImplEndpoint *self = WP_IMPL_ENDPOINT (object);
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
switch (property_id) {
|
|
|
|
|
case IMPL_PROP_ITEM:
|
|
|
|
|
g_value_set_object (value, self->item);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
|
|
|
break;
|
2019-12-09 16:35:15 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
enum {
|
|
|
|
|
STEP_ACTIVATE_NODE = STEP_STREAMS + 1,
|
|
|
|
|
};
|
2020-03-20 14:45:17 +02:00
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
static guint
|
|
|
|
|
wp_impl_endpoint_activate_get_next_step (WpObject * object,
|
|
|
|
|
WpFeatureActivationTransition * transition, guint step,
|
|
|
|
|
WpObjectFeatures missing)
|
|
|
|
|
{
|
|
|
|
|
WpImplEndpoint *self = WP_IMPL_ENDPOINT (object);
|
2020-03-31 19:31:54 +03:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
/* before anything else, if the item has a node,
|
|
|
|
|
cache its props so that enum_params works */
|
|
|
|
|
if (missing & WP_PIPEWIRE_OBJECT_FEATURES_ALL) {
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_autoptr (WpObject) node = wp_session_item_get_associated_proxy (
|
|
|
|
|
WP_SESSION_ITEM (self->item), WP_TYPE_NODE);
|
2020-05-29 09:30:36 +03:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
if (node && (wp_object_get_supported_features (node) &
|
|
|
|
|
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS) &&
|
|
|
|
|
!(wp_object_get_active_features (node) &
|
|
|
|
|
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS))
|
|
|
|
|
return STEP_ACTIVATE_NODE;
|
2020-05-29 09:30:36 +03:00
|
|
|
}
|
2020-11-25 14:02:33 +02:00
|
|
|
|
|
|
|
|
return WP_OBJECT_CLASS (wp_impl_endpoint_parent_class)->
|
|
|
|
|
activate_get_next_step (object, transition, step, missing);
|
2020-05-29 09:30:36 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_impl_endpoint_node_activated (WpObject * node,
|
|
|
|
|
GAsyncResult * res, WpTransition * transition)
|
2020-05-29 09:30:36 +03:00
|
|
|
{
|
2020-11-25 14:02:33 +02:00
|
|
|
WpImplEndpoint *self = wp_transition_get_source_object (transition);
|
2020-05-29 09:30:36 +03:00
|
|
|
g_autoptr (GError) error = NULL;
|
2020-03-20 14:45:17 +02:00
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
if (!wp_object_activate_finish (node, res, &error)) {
|
|
|
|
|
wp_transition_return_error (transition, g_steal_pointer (&error));
|
2020-05-29 09:30:36 +03:00
|
|
|
return;
|
2020-03-20 14:45:17 +02:00
|
|
|
}
|
2019-12-09 16:35:15 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
self->info.params = impl_param_info;
|
|
|
|
|
self->info.n_params = G_N_ELEMENTS (impl_param_info);
|
|
|
|
|
|
|
|
|
|
g_signal_connect_object (node, "params-changed",
|
|
|
|
|
G_CALLBACK (on_node_params_changed), self, 0);
|
|
|
|
|
|
|
|
|
|
wp_object_update_features (WP_OBJECT (self),
|
|
|
|
|
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS, 0);
|
|
|
|
|
wp_pw_object_mixin_notify_info (self, PW_ENDPOINT_CHANGE_MASK_PARAMS);
|
2020-05-29 09:30:36 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_impl_endpoint_activate_execute_step (WpObject * object,
|
|
|
|
|
WpFeatureActivationTransition * transition, guint step,
|
|
|
|
|
WpObjectFeatures missing)
|
2020-05-29 09:30:36 +03:00
|
|
|
{
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
WpImplEndpoint *self = WP_IMPL_ENDPOINT (object);
|
2020-05-29 09:30:36 +03:00
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
switch (step) {
|
|
|
|
|
case STEP_ACTIVATE_NODE: {
|
|
|
|
|
g_autoptr (WpObject) node = wp_session_item_get_associated_proxy (
|
2020-05-29 09:30:36 +03:00
|
|
|
WP_SESSION_ITEM (self->item), WP_TYPE_NODE);
|
2019-12-09 16:35:15 +02:00
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_object_activate (node,
|
2020-11-25 14:02:33 +02:00
|
|
|
WP_PROXY_FEATURE_BOUND | WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS,
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
NULL, (GAsyncReadyCallback) wp_impl_endpoint_node_activated,
|
|
|
|
|
transition);
|
|
|
|
|
break;
|
2019-12-09 16:35:15 +02:00
|
|
|
}
|
2020-11-25 14:02:33 +02:00
|
|
|
case WP_PW_OBJECT_MIXIN_STEP_BIND: {
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
g_autoptr (WpCore) core = wp_object_get_core (WP_OBJECT (self));
|
|
|
|
|
struct pw_core *pw_core = wp_core_get_pw_core (core);
|
|
|
|
|
|
|
|
|
|
/* no pw_core -> we are not connected */
|
|
|
|
|
if (!pw_core) {
|
|
|
|
|
wp_transition_return_error (WP_TRANSITION (transition), g_error_new (
|
|
|
|
|
WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_OPERATION_FAILED,
|
|
|
|
|
"The WirePlumber core is not connected; "
|
|
|
|
|
"object cannot be exported to PipeWire"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2020-03-31 15:14:45 +03:00
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
/* bind */
|
|
|
|
|
wp_proxy_set_pw_proxy (WP_PROXY (self), pw_core_export (pw_core,
|
|
|
|
|
PW_TYPE_INTERFACE_Endpoint,
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_properties_peek_dict (self->immutable_props),
|
|
|
|
|
&self->iface, 0));
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
default:
|
|
|
|
|
WP_OBJECT_CLASS (wp_impl_endpoint_parent_class)->
|
|
|
|
|
activate_execute_step (object, transition, step, missing);
|
|
|
|
|
break;
|
2020-03-31 15:14:45 +03:00
|
|
|
}
|
2019-12-09 16:35:15 +02:00
|
|
|
}
|
|
|
|
|
|
2020-05-29 09:30:36 +03:00
|
|
|
static void
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_impl_endpoint_pw_proxy_destroyed (WpProxy * proxy)
|
2020-05-29 09:30:36 +03:00
|
|
|
{
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
WpEndpointPrivate *priv =
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_endpoint_get_instance_private (WP_ENDPOINT (proxy));
|
2020-05-29 09:30:36 +03:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
g_clear_object (&priv->streams_om);
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wp_object_update_features (WP_OBJECT (proxy), 0,
|
2020-11-25 14:02:33 +02:00
|
|
|
WP_ENDPOINT_FEATURE_STREAMS);
|
2020-05-29 09:30:36 +03:00
|
|
|
}
|
|
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
static void
|
|
|
|
|
wp_impl_endpoint_class_init (WpImplEndpointClass * klass)
|
2019-12-09 18:31:43 +02:00
|
|
|
{
|
2020-03-20 14:45:17 +02:00
|
|
|
GObjectClass *object_class = (GObjectClass *) klass;
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
WpObjectClass *wpobject_class = (WpObjectClass *) klass;
|
2020-03-20 14:45:17 +02:00
|
|
|
WpProxyClass *proxy_class = (WpProxyClass *) klass;
|
2019-12-09 18:31:43 +02:00
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
object_class->constructed = wp_impl_endpoint_constructed;
|
|
|
|
|
object_class->dispose = wp_impl_endpoint_dispose;
|
2020-03-20 14:45:17 +02:00
|
|
|
object_class->set_property = wp_impl_endpoint_set_property;
|
|
|
|
|
object_class->get_property = wp_impl_endpoint_get_property;
|
2019-12-09 18:31:43 +02:00
|
|
|
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
wpobject_class->activate_get_next_step =
|
|
|
|
|
wp_impl_endpoint_activate_get_next_step;
|
|
|
|
|
wpobject_class->activate_execute_step =
|
|
|
|
|
wp_impl_endpoint_activate_execute_step;
|
|
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
proxy_class->pw_proxy_created = NULL;
|
lib: refactor WpProxy
This is an attempt to unclutter the API of WpProxy and
split functionality into smaller pieces, making it easier
to work with.
In this new class layout, we have the following classes:
- WpObject: base class for everything; handles activating
| and deactivating "features"
|- WpProxy: base class for anything that wraps a pw_proxy;
| handles events from pw_proxy and nothing more
|- WpGlobalProxy: handles integration with the registry
All the other classes derive from WpGlobalProxy. The reason
for separating WpGlobalProxy from WpProxy, though, is that
classes such as WpImplNode / WpSpaDevice can also derive from
WpProxy now, without interfacing with the registry.
All objects that come with an "info" structure and have properties
and/or params also implement the WpPipewireObject interface. This
provides the API to query properties and get/set params. Essentially,
this is implemented by all classes except WpMetadata (pw_metadata
does not have info)
This interface is implemented on each object separately, using
a private "mixin", which is a set of vfunc implementations and helper
functions (and macros) to facilitate the implementation of this interface.
A notable difference to the old WpProxy is that now features can be
deactivated, so it is possible to enable something and later disable
it again.
This commit disables modules, tests, tools, etc, to avoid growing the
patch more, while ensuring that the project compiles.
2020-11-10 19:17:02 +02:00
|
|
|
proxy_class->pw_proxy_destroyed = wp_impl_endpoint_pw_proxy_destroyed;
|
2019-12-09 18:31:43 +02:00
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
g_object_class_install_property (object_class, IMPL_PROP_ITEM,
|
|
|
|
|
g_param_spec_object ("item", "item", "item", WP_TYPE_SI_ENDPOINT,
|
|
|
|
|
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
|
2019-12-09 18:31:43 +02:00
|
|
|
}
|
|
|
|
|
|
2020-11-25 14:02:33 +02:00
|
|
|
static GPtrArray *
|
|
|
|
|
wp_impl_endpoint_enum_params_sync (gpointer instance, guint32 id,
|
|
|
|
|
guint32 start, guint32 num, WpSpaPod *filter)
|
|
|
|
|
{
|
|
|
|
|
WpImplEndpoint *self = WP_IMPL_ENDPOINT (instance);
|
|
|
|
|
g_autoptr (WpPipewireObject) node = wp_session_item_get_associated_proxy (
|
|
|
|
|
WP_SESSION_ITEM (self->item), WP_TYPE_NODE);
|
|
|
|
|
|
|
|
|
|
if (!node) {
|
|
|
|
|
wp_warning_object (self, "associated node is no longer available");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* bypass a few things, knowing that the node
|
|
|
|
|
caches params in the mixin param store */
|
|
|
|
|
WpPwObjectMixinData *data = wp_pw_object_mixin_get_data (node);
|
|
|
|
|
GPtrArray *params = wp_pw_object_mixin_get_stored_params (data, id);
|
|
|
|
|
/* TODO filter */
|
|
|
|
|
|
|
|
|
|
return params;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gint
|
|
|
|
|
wp_impl_endpoint_set_param (gpointer instance, guint32 id, guint32 flags,
|
|
|
|
|
WpSpaPod * param)
|
|
|
|
|
{
|
|
|
|
|
WpImplEndpoint *self = WP_IMPL_ENDPOINT (instance);
|
|
|
|
|
g_autoptr (WpPipewireObject) node = wp_session_item_get_associated_proxy (
|
|
|
|
|
WP_SESSION_ITEM (self->item), WP_TYPE_NODE);
|
|
|
|
|
|
|
|
|
|
if (!node) {
|
|
|
|
|
wp_warning_object (self, "associated node is no longer available");
|
|
|
|
|
return -EPIPE;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-13 20:11:41 +02:00
|
|
|
WpSpaIdValue idval = wp_spa_id_value_from_number ("Spa:Enum:ParamId", id);
|
|
|
|
|
if (!idval) {
|
2020-11-25 14:02:33 +02:00
|
|
|
wp_critical_object (self, "invalid param id: %u", id);
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-13 20:11:41 +02:00
|
|
|
return wp_pipewire_object_set_param (node, wp_spa_id_value_short_name (idval),
|
|
|
|
|
flags, param) ? 0 : -EIO;
|
2020-11-25 14:02:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define pw_endpoint_emit(hooks,method,version,...) \
|
|
|
|
|
spa_hook_list_call_simple(hooks, struct pw_endpoint_events, \
|
|
|
|
|
method, version, ##__VA_ARGS__)
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wp_impl_endpoint_emit_info (struct spa_hook_list * hooks, gconstpointer info)
|
|
|
|
|
{
|
|
|
|
|
pw_endpoint_emit (hooks, info, 0, info);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wp_impl_endpoint_emit_param (struct spa_hook_list * hooks, int seq,
|
|
|
|
|
guint32 id, guint32 index, guint32 next, const struct spa_pod *param)
|
|
|
|
|
{
|
|
|
|
|
pw_endpoint_emit (hooks, param, 0, seq, id, index, next, param);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wp_endpoint_impl_pw_object_mixin_priv_interface_init (
|
|
|
|
|
WpPwObjectMixinPrivInterface * iface)
|
|
|
|
|
{
|
|
|
|
|
iface->flags |= WP_PW_OBJECT_MIXIN_PRIV_NO_PARAM_CACHE;
|
|
|
|
|
iface->enum_params_sync = wp_impl_endpoint_enum_params_sync;
|
|
|
|
|
iface->set_param = wp_impl_endpoint_set_param;
|
|
|
|
|
iface->emit_info = wp_impl_endpoint_emit_info;
|
|
|
|
|
iface->emit_param = wp_impl_endpoint_emit_param;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
WpImplEndpoint *
|
|
|
|
|
wp_impl_endpoint_new (WpCore * core, WpSiEndpoint * item)
|
2019-12-09 18:31:43 +02:00
|
|
|
{
|
2020-03-20 14:45:17 +02:00
|
|
|
g_return_val_if_fail (WP_IS_CORE (core), NULL);
|
2019-12-09 18:31:43 +02:00
|
|
|
|
2020-03-20 14:45:17 +02:00
|
|
|
return g_object_new (WP_TYPE_IMPL_ENDPOINT,
|
|
|
|
|
"core", core,
|
|
|
|
|
"item", item,
|
|
|
|
|
NULL);
|
2019-12-09 18:31:43 +02:00
|
|
|
}
|