From 18c0a31fa41f925e3324042bea940155ae6bf774 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Wed, 18 Sep 2024 11:50:29 +0200 Subject: device id null check --- lib/wireplumber/src/endpoint.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/wireplumber/src') diff --git a/lib/wireplumber/src/endpoint.c b/lib/wireplumber/src/endpoint.c index 8d5411d..9ae62e2 100644 --- a/lib/wireplumber/src/endpoint.c +++ b/lib/wireplumber/src/endpoint.c @@ -345,6 +345,7 @@ static void astal_wp_endpoint_set_property(GObject *object, guint property_id, c } static void astal_wp_endpoint_update_properties(AstalWpEndpoint *self) { + AstalWpEndpointPrivate *priv = astal_wp_endpoint_get_instance_private(self); if (priv->node == NULL) return; self->id = wp_proxy_get_bound_id(WP_PROXY(priv->node)); @@ -379,9 +380,11 @@ static void astal_wp_endpoint_update_properties(AstalWpEndpoint *self) { case ASTAL_WP_MEDIA_CLASS_AUDIO_MICROPHONE: const gchar *dev = wp_pipewire_object_get_property(WP_PIPEWIRE_OBJECT(priv->node), "device.id"); - guint device_id = g_ascii_strtoull(dev, NULL, 10); - AstalWpDevice *device = astal_wp_wp_get_device(priv->wp, device_id); - icon = astal_wp_device_get_icon(device); + if (dev != NULL) { + guint device_id = g_ascii_strtoull(dev, NULL, 10); + AstalWpDevice *device = astal_wp_wp_get_device(priv->wp, device_id); + icon = astal_wp_device_get_icon(device); + } if (icon == NULL) { icon = self->type == ASTAL_WP_MEDIA_CLASS_AUDIO_SPEAKER ? "audio-card-symbolic" -- cgit v1.2.3 From de096e16da8a76c60b97ca0238a1cd1b545fa295 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Wed, 18 Sep 2024 12:55:40 +0200 Subject: wireplumber: rename get_default_wp to get_default --- lib/wireplumber/src/wireplumber.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/wireplumber/src') diff --git a/lib/wireplumber/src/wireplumber.c b/lib/wireplumber/src/wireplumber.c index cc3aa82..6babed1 100644 --- a/lib/wireplumber/src/wireplumber.c +++ b/lib/wireplumber/src/wireplumber.c @@ -352,13 +352,13 @@ AstalWpWp *astal_wp_wp_get_default() { } /** - * astal_wp_get_default_wp + * astal_wp_get_default * * gets the default wireplumber object. * * Returns: (nullable) (transfer none): gets the default wireplumber object. */ -AstalWpWp *astal_wp_get_default_wp() { return astal_wp_wp_get_default(); } +AstalWpWp *astal_wp_get_default() { return astal_wp_wp_get_default(); } static void astal_wp_wp_dispose(GObject *object) { AstalWpWp *self = ASTAL_WP_WP(object); -- cgit v1.2.3