fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2026-05-05 20:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa-pod: remove const-ness from API

Browse source
This commit is contained in:
Julian Bouzas 2020-06-04 09:31:01 -04:00
parent 1e2dcb44ca
commit 9728418b6d
12 changed files with 131 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/wp/device.c
View file

@ -91,7 +91,7 @@ wp_device_get_param_info (WpProxy * self, guint * n_params)
static gint
wp_device_enum_params (WpProxy * self, guint32 id, guint32 start,
guint32 num, const WpSpaPod * filter)
guint32 num, WpSpaPod * filter)
{
struct pw_device *pwp = (struct pw_device *) wp_proxy_get_pw_proxy (self);
return pw_device_enum_params (pwp, 0, id, start, num,
@ -106,8 +106,7 @@ wp_device_subscribe_params (WpProxy * self, guint32 *ids, guint32 n_ids)
}
static gint
wp_device_set_param (WpProxy * self, guint32 id, guint32 flags,
const WpSpaPod *param)
wp_device_set_param (WpProxy * self, guint32 id, guint32 flags, WpSpaPod *param)
{
struct pw_device *pwp = (struct pw_device *) wp_proxy_get_pw_proxy (self);
return pw_device_set_param (pwp, id, flags,
@ -365,7 +364,7 @@ wp_spa_device_get_properties (WpProxy * proxy)
static gint
wp_spa_device_enum_params (WpProxy * proxy, guint32 id, guint32 start,
guint32 num, const WpSpaPod * filter)
guint32 num, WpSpaPod * filter)
{
WpSpaDevice *self = WP_SPA_DEVICE (proxy);
return spa_device_enum_params (self->interface,
@ -374,7 +373,7 @@ wp_spa_device_enum_params (WpProxy * proxy, guint32 id, guint32 start,
static gint
wp_spa_device_set_param (WpProxy * proxy, guint32 id, guint32 flags,
const WpSpaPod *param)
WpSpaPod *param)
{
WpSpaDevice *self = WP_SPA_DEVICE (proxy);
return spa_device_set_param (self->interface,

4
lib/wp/endpoint-link.c
View file

@ -97,7 +97,7 @@ wp_endpoint_link_get_param_info (WpProxy * proxy, guint * n_params)
static gint
wp_endpoint_link_enum_params (WpProxy * self, guint32 id, guint32 start,
guint32 num, const WpSpaPod * filter)
guint32 num, WpSpaPod * filter)
{
WpEndpointLinkPrivate *priv =
wp_endpoint_link_get_instance_private (WP_ENDPOINT_LINK (self));
@ -115,7 +115,7 @@ wp_endpoint_link_subscribe_params (WpProxy * self, guint32 *ids, guint32 n_ids)
static gint
wp_endpoint_link_set_param (WpProxy * self, guint32 id, guint32 flags,
const WpSpaPod *param)
WpSpaPod *param)
{
WpEndpointLinkPrivate *priv =
wp_endpoint_link_get_instance_private (WP_ENDPOINT_LINK (self));

4
lib/wp/endpoint-stream.c
View file

@ -117,7 +117,7 @@ wp_endpoint_stream_get_param_info (WpProxy * proxy, guint * n_params)
static gint
wp_endpoint_stream_enum_params (WpProxy * self, guint32 id, guint32 start,
guint32 num, const WpSpaPod * filter)
guint32 num, WpSpaPod * filter)
{
WpEndpointStreamPrivate *priv =
wp_endpoint_stream_get_instance_private (WP_ENDPOINT_STREAM (self));
@ -135,7 +135,7 @@ wp_endpoint_stream_subscribe_params (WpProxy * self, guint32 *ids, guint32 n_ids
static gint
wp_endpoint_stream_set_param (WpProxy * self, guint32 id, guint32 flags,
const WpSpaPod *param)
WpSpaPod *param)
{
WpEndpointStreamPrivate *priv =
wp_endpoint_stream_get_instance_private (WP_ENDPOINT_STREAM (self));

6
lib/wp/endpoint.c
View file

@ -217,8 +217,8 @@ wp_endpoint_get_param_info (WpProxy * proxy, guint * n_params)
}
static gint
wp_endpoint_enum_params (WpProxy * self, guint32 id, guint32 start,
guint32 num, const WpSpaPod * filter)
wp_endpoint_enum_params (WpProxy * self, guint32 id, guint32 start, guint32 num,
WpSpaPod * filter)
{
WpEndpointPrivate *priv =
wp_endpoint_get_instance_private (WP_ENDPOINT (self));
@ -236,7 +236,7 @@ wp_endpoint_subscribe_params (WpProxy * self, guint32 *ids, guint32 n_ids)
static gint
wp_endpoint_set_param (WpProxy * self, guint32 id, guint32 flags,
const WpSpaPod *param)
WpSpaPod *param)
{
WpEndpointPrivate *priv =
wp_endpoint_get_instance_private (WP_ENDPOINT (self));

7
lib/wp/node.c
View file

@ -157,8 +157,8 @@ wp_node_get_param_info (WpProxy * proxy, guint * n_params)
}
static gint
wp_node_enum_params (WpProxy * self, guint32 id, guint32 start,
guint32 num, const WpSpaPod * filter)
wp_node_enum_params (WpProxy * self, guint32 id, guint32 start, guint32 num,
WpSpaPod * filter)
{
struct pw_node *pwp = (struct pw_node *) wp_proxy_get_pw_proxy (self);
return pw_node_enum_params (pwp, 0, id, start, num,
@ -173,8 +173,7 @@ wp_node_subscribe_params (WpProxy * self, guint32 *ids, guint32 n_ids)
}
static gint
wp_node_set_param (WpProxy * self, guint32 id, guint32 flags,
const WpSpaPod *param)
wp_node_set_param (WpProxy * self, guint32 id, guint32 flags, WpSpaPod *param)
{
struct pw_node *pwp = (struct pw_node *) wp_proxy_get_pw_proxy (self);
return pw_node_set_param (pwp, id, flags, wp_spa_pod_get_spa_pod (param));

4
lib/wp/port.c
View file

@ -73,8 +73,8 @@ wp_port_get_param_info (WpProxy * proxy, guint * n_params)
}
static gint
wp_port_enum_params (WpProxy * self, guint32 id, guint32 start,
guint32 num, const WpSpaPod * filter)
wp_port_enum_params (WpProxy * self, guint32 id, guint32 start, guint32 num,
WpSpaPod * filter)
{
struct pw_port *pwp = (struct pw_port *) wp_proxy_get_pw_proxy (self);
return pw_port_enum_params (pwp, 0, id, start, num,

8
lib/wp/proxy.c
View file

@ -914,9 +914,9 @@ enum_params_done (WpCore * core, GAsyncResult * res, gpointer data)
* with wp_proxy_enum_params_finish().
*/
void
wp_proxy_enum_params (WpProxy * self, const gchar * id,
const WpSpaPod *filter, GCancellable * cancellable,
GAsyncReadyCallback callback, gpointer user_data)
wp_proxy_enum_params (WpProxy * self, const gchar * id, WpSpaPod *filter,
GCancellable * cancellable, GAsyncReadyCallback callback,
gpointer user_data)
{
g_autoptr (GTask) task = NULL;
guint32 id_num = 0;
@ -989,7 +989,7 @@ wp_proxy_enum_params_finish (WpProxy * self, GAsyncResult * res,
* Sets a parameter on the object.
*/
void
wp_proxy_set_param (WpProxy * self, const gchar * id, const WpSpaPod *param)
wp_proxy_set_param (WpProxy * self, const gchar * id, WpSpaPod *param)
{
guint32 id_num = 0;
gint ret;

13
lib/wp/proxy.h
View file

@ -85,10 +85,10 @@ struct _WpProxyClass
struct spa_param_info * (*get_param_info) (WpProxy * self, guint * n_params);
gint (*enum_params) (WpProxy * self, guint32 id, guint32 start, guint32 num,
const WpSpaPod * filter);
WpSpaPod * filter);
gint (*subscribe_params) (WpProxy * self, guint32 *ids, guint32 n_ids);
gint (*set_param) (WpProxy * self, guint32 id, guint32 flags,
const WpSpaPod * param);
WpSpaPod * param);
/* signals */
@ -155,17 +155,16 @@ guint32 wp_proxy_get_bound_id (WpProxy * self);
/* params API */
WP_API
void wp_proxy_enum_params (WpProxy * self, const gchar * id,
const WpSpaPod *filter, GCancellable * cancellable,
GAsyncReadyCallback callback, gpointer user_data);
void wp_proxy_enum_params (WpProxy * self, const gchar * id, WpSpaPod *filter,
GCancellable * cancellable, GAsyncReadyCallback callback,
gpointer user_data);
WP_API
WpIterator * wp_proxy_enum_params_finish (WpProxy * self, GAsyncResult * res,
GError ** error);
WP_API
void wp_proxy_set_param (WpProxy * self, const gchar * id,
const WpSpaPod * param);
void wp_proxy_set_param (WpProxy * self, const gchar * id, WpSpaPod * param);
/* PARAM_PropInfo - PARAM_Props */

4
lib/wp/session.c
View file

@ -208,7 +208,7 @@ wp_session_get_param_info (WpProxy * proxy, guint * n_params)
static gint
wp_session_enum_params (WpProxy * self, guint32 id, guint32 start,
guint32 num, const WpSpaPod * filter)
guint32 num, WpSpaPod * filter)
{
WpSessionPrivate *priv = wp_session_get_instance_private (WP_SESSION (self));
return pw_session_enum_params (priv->iface, 0, id,
@ -224,7 +224,7 @@ wp_session_subscribe_params (WpProxy * self, guint32 *ids, guint32 n_ids)
static gint
wp_session_set_param (WpProxy * self, guint32 id, guint32 flags,
const WpSpaPod *param)
WpSpaPod *param)
{
WpSessionPrivate *priv = wp_session_get_instance_private (WP_SESSION (self));
return pw_session_set_param (priv->iface, id, flags,

104
lib/wp/spa-pod.c
View file

@ -85,7 +85,7 @@ struct _WpSpaPodParser
{
guint32 type;
struct spa_pod_parser parser;
const WpSpaPod *pod;
WpSpaPod *pod;
struct spa_pod_frame frame;
WpSpaTypeTable prop_table; /* Only used when parsing properties */
};
@ -289,7 +289,7 @@ wp_spa_pod_get_spa_pod (const WpSpaPod *self)
* Returns: the type name of the spa pod object
*/
const char *
wp_spa_pod_get_type_name (const WpSpaPod *self)
wp_spa_pod_get_type_name (WpSpaPod *self)
{
const char *nick = NULL;
if (!wp_spa_type_get_by_id (WP_SPA_TYPE_TABLE_BASIC, SPA_POD_TYPE (self->pod),
@ -299,7 +299,7 @@ wp_spa_pod_get_type_name (const WpSpaPod *self)
}
const char *
wp_spa_pod_get_choice_type_name (const WpSpaPod *self)
wp_spa_pod_get_choice_type_name (WpSpaPod *self)
{
g_return_val_if_fail (wp_spa_pod_is_choice (self), NULL);
@ -311,7 +311,7 @@ wp_spa_pod_get_choice_type_name (const WpSpaPod *self)
}
const char *
wp_spa_pod_get_object_type_name (const WpSpaPod *self)
wp_spa_pod_get_object_type_name (WpSpaPod *self)
{
g_return_val_if_fail (wp_spa_pod_is_object (self), NULL);
@ -331,7 +331,7 @@ wp_spa_pod_get_object_type_name (const WpSpaPod *self)
* Returns: (transfer full): The newly copied spa pod
*/
WpSpaPod *
wp_spa_pod_copy (const WpSpaPod *other)
wp_spa_pod_copy (WpSpaPod *other)
{
g_return_val_if_fail (other, NULL);
switch (other->type) {
@ -792,7 +792,7 @@ wp_spa_pod_new_sequence_valist (guint unit, va_list args)
* Returns: TRUE if it is of type none, FALSE otherwise
*/
gboolean
wp_spa_pod_is_none (const WpSpaPod *self)
wp_spa_pod_is_none (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_none (self->pod);
}
@ -806,7 +806,7 @@ wp_spa_pod_is_none (const WpSpaPod *self)
* Returns: TRUE if it is of type boolean, FALSE otherwise
*/
gboolean
wp_spa_pod_is_boolean (const WpSpaPod *self)
wp_spa_pod_is_boolean (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR &&
spa_pod_is_bool (self->pod) ? TRUE : FALSE;
@ -821,7 +821,7 @@ wp_spa_pod_is_boolean (const WpSpaPod *self)
* Returns: TRUE if it is of type Id, FALSE otherwise
*/
gboolean
wp_spa_pod_is_id (const WpSpaPod *self)
wp_spa_pod_is_id (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_id (self->pod);
}
@ -835,7 +835,7 @@ wp_spa_pod_is_id (const WpSpaPod *self)
* Returns: TRUE if it is of type int, FALSE otherwise
*/
gboolean
wp_spa_pod_is_int (const WpSpaPod *self)
wp_spa_pod_is_int (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_int (self->pod);
}
@ -849,7 +849,7 @@ wp_spa_pod_is_int (const WpSpaPod *self)
* Returns: TRUE if it is of type long, FALSE otherwise
*/
gboolean
wp_spa_pod_is_long (const WpSpaPod *self)
wp_spa_pod_is_long (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_long (self->pod);
}
@ -863,7 +863,7 @@ wp_spa_pod_is_long (const WpSpaPod *self)
* Returns: TRUE if it is of type float, FALSE otherwise
*/
gboolean
wp_spa_pod_is_float (const WpSpaPod *self)
wp_spa_pod_is_float (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_float (self->pod);
}
@ -877,7 +877,7 @@ wp_spa_pod_is_float (const WpSpaPod *self)
* Returns: TRUE if it is of type double, FALSE otherwise
*/
gboolean
wp_spa_pod_is_double (const WpSpaPod *self)
wp_spa_pod_is_double (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_double (self->pod);
}
@ -891,7 +891,7 @@ wp_spa_pod_is_double (const WpSpaPod *self)
* Returns: TRUE if it is of type string, FALSE otherwise
*/
gboolean
wp_spa_pod_is_string (const WpSpaPod *self)
wp_spa_pod_is_string (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_string (self->pod);
}
@ -905,7 +905,7 @@ wp_spa_pod_is_string (const WpSpaPod *self)
* Returns: TRUE if it is of type bytes, FALSE otherwise
*/
gboolean
wp_spa_pod_is_bytes (const WpSpaPod *self)
wp_spa_pod_is_bytes (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_bytes (self->pod);
}
@ -919,7 +919,7 @@ wp_spa_pod_is_bytes (const WpSpaPod *self)
* Returns: TRUE if it is of type pointer, FALSE otherwise
*/
gboolean
wp_spa_pod_is_pointer (const WpSpaPod *self)
wp_spa_pod_is_pointer (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_pointer (self->pod);
}
@ -933,7 +933,7 @@ wp_spa_pod_is_pointer (const WpSpaPod *self)
* Returns: TRUE if it is of type Fd, FALSE otherwise
*/
gboolean
wp_spa_pod_is_fd (const WpSpaPod *self)
wp_spa_pod_is_fd (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_fd (self->pod);
}
@ -947,7 +947,7 @@ wp_spa_pod_is_fd (const WpSpaPod *self)
* Returns: TRUE if it is of type rectangle, FALSE otherwise
*/
gboolean
wp_spa_pod_is_rectangle (const WpSpaPod *self)
wp_spa_pod_is_rectangle (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_rectangle (self->pod);
}
@ -961,7 +961,7 @@ wp_spa_pod_is_rectangle (const WpSpaPod *self)
* Returns: TRUE if it is of type fraction, FALSE otherwise
*/
gboolean
wp_spa_pod_is_fraction (const WpSpaPod *self)
wp_spa_pod_is_fraction (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_fraction (self->pod);
}
@ -975,7 +975,7 @@ wp_spa_pod_is_fraction (const WpSpaPod *self)
* Returns: TRUE if it is of type array, FALSE otherwise
*/
gboolean
wp_spa_pod_is_array (const WpSpaPod *self)
wp_spa_pod_is_array (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_array (self->pod);
}
@ -989,7 +989,7 @@ wp_spa_pod_is_array (const WpSpaPod *self)
* Returns: TRUE if it is of type choice, FALSE otherwise
*/
gboolean
wp_spa_pod_is_choice (const WpSpaPod *self)
wp_spa_pod_is_choice (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_choice (self->pod);
}
@ -1003,7 +1003,7 @@ wp_spa_pod_is_choice (const WpSpaPod *self)
* Returns: TRUE if it is of type object, FALSE otherwise
*/
gboolean
wp_spa_pod_is_object (const WpSpaPod *self)
wp_spa_pod_is_object (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_object (self->pod);
}
@ -1017,7 +1017,7 @@ wp_spa_pod_is_object (const WpSpaPod *self)
* Returns: TRUE if it is of type struct, FALSE otherwise
*/
gboolean
wp_spa_pod_is_struct (const WpSpaPod *self)
wp_spa_pod_is_struct (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_struct (self->pod);
}
@ -1031,7 +1031,7 @@ wp_spa_pod_is_struct (const WpSpaPod *self)
* Returns: TRUE if it is of type sequence, FALSE otherwise
*/
gboolean
wp_spa_pod_is_sequence (const WpSpaPod *self)
wp_spa_pod_is_sequence (WpSpaPod *self)
{
return self->type == WP_SPA_POD_REGULAR && spa_pod_is_sequence (self->pod);
}
@ -1045,7 +1045,7 @@ wp_spa_pod_is_sequence (const WpSpaPod *self)
* Returns: TRUE if it is of type property, FALSE otherwise
*/
gboolean
wp_spa_pod_is_property (const WpSpaPod *self)
wp_spa_pod_is_property (WpSpaPod *self)
{
return self->type == WP_SPA_POD_PROPERTY;
}
@ -1059,7 +1059,7 @@ wp_spa_pod_is_property (const WpSpaPod *self)
* Returns: TRUE if it is of type control, FALSE otherwise
*/
gboolean
wp_spa_pod_is_control (const WpSpaPod *self)
wp_spa_pod_is_control (WpSpaPod *self)
{
return self->type == WP_SPA_POD_CONTROL;
}
@ -1074,7 +1074,7 @@ wp_spa_pod_is_control (const WpSpaPod *self)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_boolean (const WpSpaPod *self, gboolean *value)
wp_spa_pod_get_boolean (WpSpaPod *self, gboolean *value)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (value, FALSE);
@ -1094,7 +1094,7 @@ wp_spa_pod_get_boolean (const WpSpaPod *self, gboolean *value)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_id (const WpSpaPod *self, guint32 *value)
wp_spa_pod_get_id (WpSpaPod *self, guint32 *value)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (value, FALSE);
@ -1114,7 +1114,7 @@ wp_spa_pod_get_id (const WpSpaPod *self, guint32 *value)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_int (const WpSpaPod *self, gint *value)
wp_spa_pod_get_int (WpSpaPod *self, gint *value)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (value, FALSE);
@ -1131,7 +1131,7 @@ wp_spa_pod_get_int (const WpSpaPod *self, gint *value)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_long (const WpSpaPod *self, glong *value)
wp_spa_pod_get_long (WpSpaPod *self, glong *value)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (value, FALSE);
@ -1148,7 +1148,7 @@ wp_spa_pod_get_long (const WpSpaPod *self, glong *value)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_float (const WpSpaPod *self, float *value)
wp_spa_pod_get_float (WpSpaPod *self, float *value)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (value, FALSE);
@ -1165,7 +1165,7 @@ wp_spa_pod_get_float (const WpSpaPod *self, float *value)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_double (const WpSpaPod *self, double *value)
wp_spa_pod_get_double (WpSpaPod *self, double *value)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (value, FALSE);
@ -1182,7 +1182,7 @@ wp_spa_pod_get_double (const WpSpaPod *self, double *value)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_string (const WpSpaPod *self, const char **value)
wp_spa_pod_get_string (WpSpaPod *self, const char **value)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (value, FALSE);
@ -1200,7 +1200,7 @@ wp_spa_pod_get_string (const WpSpaPod *self, const char **value)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_bytes (const WpSpaPod *self, gconstpointer *value, guint32 *len)
wp_spa_pod_get_bytes (WpSpaPod *self, gconstpointer *value, guint32 *len)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (value, FALSE);
@ -1219,7 +1219,7 @@ wp_spa_pod_get_bytes (const WpSpaPod *self, gconstpointer *value, guint32 *len)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_pointer (const WpSpaPod *self, const char **type_name,
wp_spa_pod_get_pointer (WpSpaPod *self, const char **type_name,
gconstpointer *value)
{
gboolean res;
@ -1246,7 +1246,7 @@ wp_spa_pod_get_pointer (const WpSpaPod *self, const char **type_name,
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_fd (const WpSpaPod *self, gint64 *value)
wp_spa_pod_get_fd (WpSpaPod *self, gint64 *value)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (value, FALSE);
@ -1264,7 +1264,7 @@ wp_spa_pod_get_fd (const WpSpaPod *self, gint64 *value)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_rectangle (const WpSpaPod *self, guint32 *width, guint32 *height)
wp_spa_pod_get_rectangle (WpSpaPod *self, guint32 *width, guint32 *height)
{
g_return_val_if_fail (self, FALSE);
struct spa_rectangle rectangle = { 0, };
@ -1287,7 +1287,7 @@ wp_spa_pod_get_rectangle (const WpSpaPod *self, guint32 *width, guint32 *height)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_fraction (const WpSpaPod *self, guint32 *num, guint32 *denom)
wp_spa_pod_get_fraction (WpSpaPod *self, guint32 *num, guint32 *denom)
{
g_return_val_if_fail (self, FALSE);
struct spa_fraction fraction = { 0, };
@ -1504,7 +1504,7 @@ wp_spa_pod_set_fraction (WpSpaPod *self, guint32 num, guint32 denom)
* Returns: TRUE if the value could be set, FALSE othewrise.
*/
gboolean
wp_spa_pod_set_pod (WpSpaPod *self, const WpSpaPod *pod)
wp_spa_pod_set_pod (WpSpaPod *self, WpSpaPod *pod)
{
g_return_val_if_fail (self->type == pod->type, FALSE);
g_return_val_if_fail (SPA_POD_TYPE (self->pod) == SPA_POD_TYPE (pod->pod), FALSE);
@ -1584,7 +1584,7 @@ wp_spa_pod_set_pod (WpSpaPod *self, const WpSpaPod *pod)
* Returns: TRUE if both spa pod objects have the same values, FALSE othewrise.
*/
gboolean
wp_spa_pod_equal (const WpSpaPod *self, const WpSpaPod *pod)
wp_spa_pod_equal (WpSpaPod *self, WpSpaPod *pod)
{
if (self->type != pod->type)
return FALSE;
@ -1678,7 +1678,7 @@ wp_spa_pod_equal (const WpSpaPod *self, const WpSpaPod *pod)
* Returns: TRUE if the object properties values were obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_object (const WpSpaPod *self, const char *type_name,
wp_spa_pod_get_object (WpSpaPod *self, const char *type_name,
const char **id_name, ...)
{
va_list args;
@ -1701,7 +1701,7 @@ wp_spa_pod_get_object (const WpSpaPod *self, const char *type_name,
* Returns: TRUE if the object properties values were obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_object_valist (const WpSpaPod *self, const char *type_name,
wp_spa_pod_get_object_valist (WpSpaPod *self, const char *type_name,
const char **id_name, va_list args)
{
g_return_val_if_fail (self, FALSE);
@ -1723,7 +1723,7 @@ wp_spa_pod_get_object_valist (const WpSpaPod *self, const char *type_name,
* Returns: TRUE if the struct values were obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_struct (const WpSpaPod *self, ...)
wp_spa_pod_get_struct (WpSpaPod *self, ...)
{
va_list args;
gboolean res;
@ -1743,7 +1743,7 @@ wp_spa_pod_get_struct (const WpSpaPod *self, ...)
* Returns: TRUE if the struct values were obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_struct_valist (const WpSpaPod *self, va_list args)
wp_spa_pod_get_struct_valist (WpSpaPod *self, va_list args)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (wp_spa_pod_is_struct (self), FALSE);
@ -1764,7 +1764,7 @@ wp_spa_pod_get_struct_valist (const WpSpaPod *self, va_list args)
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_property (const WpSpaPod *self, const char **key,
wp_spa_pod_get_property (WpSpaPod *self, const char **key,
WpSpaPod **value)
{
g_return_val_if_fail (self, FALSE);
@ -1791,8 +1791,8 @@ wp_spa_pod_get_property (const WpSpaPod *self, const char **key,
* Returns: TRUE if the value was obtained, FALSE otherwise
*/
gboolean
wp_spa_pod_get_control (const WpSpaPod *self, guint32 *offset,
const char **type_name, WpSpaPod **value)
wp_spa_pod_get_control (WpSpaPod *self, guint32 *offset, const char **type_name,
WpSpaPod **value)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (wp_spa_pod_is_control (self), FALSE);
@ -2173,7 +2173,7 @@ wp_spa_pod_builder_add_fraction (WpSpaPodBuilder *self, guint32 num,
* Adds a pod value into the builder
*/
void
wp_spa_pod_builder_add_pod (WpSpaPodBuilder *self, const WpSpaPod *pod)
wp_spa_pod_builder_add_pod (WpSpaPodBuilder *self, WpSpaPod *pod)
{
spa_pod_builder_primitive (&self->builder, pod->pod);
}
@ -2385,7 +2385,7 @@ wp_spa_pod_parser_unref (WpSpaPodParser *self)
}
static WpSpaPodParser *
wp_spa_pod_parser_new (const WpSpaPod *pod, guint32 type)
wp_spa_pod_parser_new (WpSpaPod *pod, guint32 type)
{
WpSpaPodParser *self = g_rc_box_new0 (WpSpaPodParser);
self->type = type;
@ -2406,7 +2406,7 @@ wp_spa_pod_parser_new (const WpSpaPod *pod, guint32 type)
* Returns: (transfer full): The new spa pod parser
*/
WpSpaPodParser *
wp_spa_pod_parser_new_object (const WpSpaPod *pod, const char *type_name,
wp_spa_pod_parser_new_object (WpSpaPod *pod, const char *type_name,
const char **id_name)
{
WpSpaPodParser *self = NULL;
@ -2435,7 +2435,7 @@ wp_spa_pod_parser_new_object (const WpSpaPod *pod, const char *type_name,
* Returns: (transfer full): The new spa pod parser
*/
WpSpaPodParser *
wp_spa_pod_parser_new_struct (const WpSpaPod *pod)
wp_spa_pod_parser_new_struct (WpSpaPod *pod)
{
WpSpaPodParser *self = NULL;
@ -2797,7 +2797,7 @@ wp_spa_pod_parser_end (WpSpaPodParser *self)
struct _WpSpaPodIterator
{
const WpSpaPod *pod;
WpSpaPod *pod;
union {
gpointer value; /* Array and Choice */
struct spa_pod *pod; /* Struct */
@ -3066,7 +3066,7 @@ wp_spa_pod_iterator_finalize (WpIterator *iterator)
* Returns: (transfer full): the new spa pod iterator
*/
WpIterator *
wp_spa_pod_iterate (const WpSpaPod *pod)
wp_spa_pod_iterate (WpSpaPod *pod)
{
static const WpIteratorMethods methods = {
.reset = wp_spa_pod_iterator_reset,

100
lib/wp/spa-pod.h
View file

@ -34,16 +34,16 @@ WP_API
void wp_spa_pod_unref (WpSpaPod *self);
WP_API
const char *wp_spa_pod_get_type_name (const WpSpaPod *self);
const char *wp_spa_pod_get_type_name (WpSpaPod *self);
WP_API
const char *wp_spa_pod_get_choice_type_name (const WpSpaPod *self);
const char *wp_spa_pod_get_choice_type_name (WpSpaPod *self);
WP_API
const char *wp_spa_pod_get_object_type_name (const WpSpaPod *self);
const char *wp_spa_pod_get_object_type_name (WpSpaPod *self);
WP_API
WpSpaPod *wp_spa_pod_copy (const WpSpaPod *other);
WpSpaPod *wp_spa_pod_copy (WpSpaPod *other);
WP_API
gboolean wp_spa_pod_is_unique_owner ( WpSpaPod *self);
@ -112,104 +112,103 @@ WP_API
WpSpaPod *wp_spa_pod_new_sequence_valist (guint unit, va_list args);
WP_API
gboolean wp_spa_pod_is_none (const WpSpaPod *self);
gboolean wp_spa_pod_is_none (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_boolean (const WpSpaPod *self);
gboolean wp_spa_pod_is_boolean (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_id (const WpSpaPod *self);
gboolean wp_spa_pod_is_id (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_int (const WpSpaPod *self);
gboolean wp_spa_pod_is_int (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_long (const WpSpaPod *self);
gboolean wp_spa_pod_is_long (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_float (const WpSpaPod *self);
gboolean wp_spa_pod_is_float (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_double (const WpSpaPod *self);
gboolean wp_spa_pod_is_double (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_string (const WpSpaPod *self);
gboolean wp_spa_pod_is_string (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_bytes (const WpSpaPod *self);
gboolean wp_spa_pod_is_bytes (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_pointer (const WpSpaPod *self);
gboolean wp_spa_pod_is_pointer (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_fd (const WpSpaPod *self);
gboolean wp_spa_pod_is_fd (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_rectangle (const WpSpaPod *self);
gboolean wp_spa_pod_is_rectangle (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_fraction (const WpSpaPod *self);
gboolean wp_spa_pod_is_fraction (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_array (const WpSpaPod *self);
gboolean wp_spa_pod_is_array (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_choice (const WpSpaPod *self);
gboolean wp_spa_pod_is_choice (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_object (const WpSpaPod *self);
gboolean wp_spa_pod_is_object (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_struct (const WpSpaPod *self);
gboolean wp_spa_pod_is_struct (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_sequence (const WpSpaPod *self);
gboolean wp_spa_pod_is_sequence (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_property (const WpSpaPod *self);
gboolean wp_spa_pod_is_property (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_is_control (const WpSpaPod *self);
gboolean wp_spa_pod_is_control (WpSpaPod *self);
WP_API
gboolean wp_spa_pod_get_boolean (const WpSpaPod *self, gboolean *value);
gboolean wp_spa_pod_get_boolean (WpSpaPod *self, gboolean *value);
WP_API
gboolean wp_spa_pod_get_id (const WpSpaPod *self, guint32 *value);
gboolean wp_spa_pod_get_id (WpSpaPod *self, guint32 *value);
WP_API
gboolean wp_spa_pod_get_int (const WpSpaPod *self, gint *value);
gboolean wp_spa_pod_get_int (WpSpaPod *self, gint *value);
WP_API
gboolean wp_spa_pod_get_long (const WpSpaPod *self, glong *value);
gboolean wp_spa_pod_get_long (WpSpaPod *self, glong *value);
WP_API
gboolean wp_spa_pod_get_float (const WpSpaPod *self, float *value);
gboolean wp_spa_pod_get_float (WpSpaPod *self, float *value);
WP_API
gboolean wp_spa_pod_get_double (const WpSpaPod *self, double *value);
gboolean wp_spa_pod_get_double (WpSpaPod *self, double *value);
WP_API
gboolean wp_spa_pod_get_string (const WpSpaPod *self, const char **value);
gboolean wp_spa_pod_get_string (WpSpaPod *self, const char **value);
WP_API
gboolean wp_spa_pod_get_bytes (const WpSpaPod *self, gconstpointer *value,
gboolean wp_spa_pod_get_bytes (WpSpaPod *self, gconstpointer *value,
guint32 *len);
WP_API
gboolean wp_spa_pod_get_pointer (const WpSpaPod *self, const char **type_name,
gboolean wp_spa_pod_get_pointer (WpSpaPod *self, const char **type_name,
gconstpointer *value);
WP_API
gboolean wp_spa_pod_get_fd (const WpSpaPod *self, gint64 *value);
gboolean wp_spa_pod_get_fd (WpSpaPod *self, gint64 *value);
WP_API
gboolean wp_spa_pod_get_rectangle (const WpSpaPod *self, guint32 *width,
gboolean wp_spa_pod_get_rectangle (WpSpaPod *self, guint32 *width,
guint32 *height);
WP_API
gboolean wp_spa_pod_get_fraction (const WpSpaPod *self, guint32 *num,
guint32 *denom);
gboolean wp_spa_pod_get_fraction (WpSpaPod *self, guint32 *num, guint32 *denom);
WP_API
gboolean wp_spa_pod_set_boolean (WpSpaPod *self, gboolean value);
@ -244,32 +243,31 @@ WP_API
gboolean wp_spa_pod_set_fraction (WpSpaPod *self, guint32 num, guint32 denom);
WP_API
gboolean wp_spa_pod_set_pod (WpSpaPod *self, const WpSpaPod *pod);
gboolean wp_spa_pod_set_pod (WpSpaPod *self, WpSpaPod *pod);
WP_API
gboolean wp_spa_pod_equal (const WpSpaPod *self, const WpSpaPod *pod);
gboolean wp_spa_pod_equal (WpSpaPod *self, WpSpaPod *pod);
WP_API
gboolean wp_spa_pod_get_object (const WpSpaPod *self, const char *type_name,
gboolean wp_spa_pod_get_object (WpSpaPod *self, const char *type_name,
const char **id_name, ...) G_GNUC_NULL_TERMINATED;
WP_API
gboolean wp_spa_pod_get_object_valist (const WpSpaPod *self,
const char *type_name, const char **id_name, va_list args);
gboolean wp_spa_pod_get_object_valist (WpSpaPod *self, const char *type_name,
const char **id_name, va_list args);
WP_API
gboolean wp_spa_pod_get_struct (const WpSpaPod *self, ...)
G_GNUC_NULL_TERMINATED;
gboolean wp_spa_pod_get_struct (WpSpaPod *self, ...) G_GNUC_NULL_TERMINATED;
WP_API
gboolean wp_spa_pod_get_struct_valist (const WpSpaPod *self, va_list args);
gboolean wp_spa_pod_get_struct_valist (WpSpaPod *self, va_list args);
WP_API
gboolean wp_spa_pod_get_property (const WpSpaPod *self, const char **key,
gboolean wp_spa_pod_get_property (WpSpaPod *self, const char **key,
WpSpaPod **value);
WP_API
gboolean wp_spa_pod_get_control (const WpSpaPod *self, guint32 *offset,
gboolean wp_spa_pod_get_control (WpSpaPod *self, guint32 *offset,
const char **type_name, WpSpaPod **value);
WP_API
@ -279,7 +277,7 @@ WP_API
WpSpaPod *wp_spa_pod_get_array_child (WpSpaPod *self);
WP_API
WpIterator *wp_spa_pod_iterate (const WpSpaPod *pod);
WpIterator *wp_spa_pod_iterate (WpSpaPod *pod);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (WpSpaPod, wp_spa_pod_unref)
@ -361,7 +359,7 @@ void wp_spa_pod_builder_add_fraction (WpSpaPodBuilder *self, guint32 num,
guint32 denom);
WP_API
void wp_spa_pod_builder_add_pod (WpSpaPodBuilder *self, const WpSpaPod *pod);
void wp_spa_pod_builder_add_pod (WpSpaPodBuilder *self, WpSpaPod *pod);
WP_API
void wp_spa_pod_builder_add_property (WpSpaPodBuilder *self, const char *key);
@ -403,11 +401,11 @@ WP_API
void wp_spa_pod_parser_unref (WpSpaPodParser *self);
WP_API
WpSpaPodParser *wp_spa_pod_parser_new_object (const WpSpaPod *pod,
WpSpaPodParser *wp_spa_pod_parser_new_object (WpSpaPod *pod,
const char *type_name, const char **id_name);
WP_API
WpSpaPodParser *wp_spa_pod_parser_new_struct (const WpSpaPod *pod);
WpSpaPodParser *wp_spa_pod_parser_new_struct (WpSpaPod *pod);
WP_API
gboolean wp_spa_pod_parser_get_boolean (WpSpaPodParser *self, gboolean *value);

4
tests/wp/spa-pod.c
View file

@ -666,7 +666,7 @@ static void
object_foreach (const GValue *item, gpointer data)
{
guint32 *total_props = data;
const WpSpaPod *prop = g_value_get_boxed (item);
WpSpaPod *prop = g_value_get_boxed (item);
g_assert_true (wp_spa_pod_is_property (prop));
*total_props += 1;
}
@ -682,7 +682,7 @@ static void
sequence_foreach (const GValue *item, gpointer data)
{
guint32 *offset_total = data;
const WpSpaPod *control = g_value_get_boxed (item);
WpSpaPod *control = g_value_get_boxed (item);
g_assert_true (wp_spa_pod_is_control (control));
guint32 offset = 0;
g_assert_true (wp_spa_pod_get_control (control, &offset, NULL, NULL));