mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gst: don't set the deprecated path anymore

Browse source 
Just use the target_object property instead which uses the object.serial
is is less prone to races when the object id is recycled.
This commit is contained in:
Wim Taymans 2023-01-10 16:47:47 +01:00
parent 1beddd78d2
commit a7df07c449
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/gst/gstpipewiredeviceprovider.c
View file

@ -53,16 +53,13 @@ gst_pipewire_device_create_element (GstDevice * device, const gchar * name)
{ {
GstPipeWireDevice *pipewire_dev = GST_PIPEWIRE_DEVICE (device); GstPipeWireDevice *pipewire_dev = GST_PIPEWIRE_DEVICE (device);
GstElement *elem; GstElement *elem;
gchar *id_str, *serial_str; gchar *serial_str;
elem = gst_element_factory_make (pipewire_dev->element, name); elem = gst_element_factory_make (pipewire_dev->element, name);
/* XXX: eventually only add target-object here */
id_str = g_strdup_printf ("%u", pipewire_dev->id);
serial_str = g_strdup_printf ("%"PRIu64, pipewire_dev->serial); serial_str = g_strdup_printf ("%"PRIu64, pipewire_dev->serial);
g_object_set (elem, "path", id_str, "target-object", serial_str, g_object_set (elem, "target-object", serial_str,
"fd", pipewire_dev->fd, NULL); "fd", pipewire_dev->fd, NULL);
g_free (id_str);
g_free (serial_str); g_free (serial_str);
return elem; return elem;
@ -72,7 +69,7 @@ static gboolean
gst_pipewire_device_reconfigure_element (GstDevice * device, GstElement * element) gst_pipewire_device_reconfigure_element (GstDevice * device, GstElement * element)
{ {
GstPipeWireDevice *pipewire_dev = GST_PIPEWIRE_DEVICE (device); GstPipeWireDevice *pipewire_dev = GST_PIPEWIRE_DEVICE (device);
gchar *id_str, *serial_str; gchar *serial_str;
if (spa_streq(pipewire_dev->element, "pipewiresrc")) { if (spa_streq(pipewire_dev->element, "pipewiresrc")) {
if (!GST_IS_PIPEWIRE_SRC (element)) if (!GST_IS_PIPEWIRE_SRC (element))
@ -84,12 +81,9 @@ gst_pipewire_device_reconfigure_element (GstDevice * device, GstElement * elemen
g_assert_not_reached (); g_assert_not_reached ();
} }
/* XXX: eventually only add target-object here */
id_str = g_strdup_printf ("%u", pipewire_dev->id);
serial_str = g_strdup_printf ("%"PRIu64, pipewire_dev->serial); serial_str = g_strdup_printf ("%"PRIu64, pipewire_dev->serial);
g_object_set (element, "path", id_str, "target-object", serial_str, g_object_set (element, "target-object", serial_str,
"fd", pipewire_dev->fd, NULL); "fd", pipewire_dev->fd, NULL);
g_free (id_str);
g_free (serial_str); g_free (serial_str);
return TRUE; return TRUE;