mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulsedeviceprovider: Add is_default_device_name function and missing lock

Browse source 
Add is_default_device_name function to simplify compare device type
name and fix the missing lock when accessing default_sink_name and
default_source_name.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6558>
This commit is contained in:
Jimmy Ohn 2024-04-07 19:39:58 +09:00 committed by GStreamer Marge Bot
parent 24c0dc9602
commit a6c8c6f866
1 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
subprojects/gst-plugins-good/ext/pulse/pulsedeviceprovider.c
View file

@ -193,12 +193,36 @@ context_state_cb (pa_context * c, void *userdata)
} }
} }
static gboolean
is_default_device_name (GstPulseDeviceProvider * self,
const char *name, GstPulseDeviceType type)
{
gboolean ret = FALSE;
GST_OBJECT_LOCK (self);
switch (type) {
case GST_PULSE_DEVICE_TYPE_SINK:
ret = !g_strcmp0 (name, self->default_sink_name);
break;
case GST_PULSE_DEVICE_TYPE_SOURCE:
ret = !g_strcmp0 (name, self->default_source_name);
break;
default:
GST_ERROR_OBJECT (self, "Unknown pulse device type!");
break;
}
GST_OBJECT_UNLOCK (self);
return ret;
}
static GstDevice * static GstDevice *
new_source (GstPulseDeviceProvider * self, const pa_source_info * info) new_source (GstPulseDeviceProvider * self, const pa_source_info * info)
{ {
GstCaps *caps; GstCaps *caps;
GstStructure *props; GstStructure *props;
guint i; guint i;
gboolean is_default = FALSE;
caps = gst_caps_new_empty (); caps = gst_caps_new_empty ();
@ -211,9 +235,11 @@ new_source (GstPulseDeviceProvider * self, const pa_source_info * info)
gst_device_provider_hide_provider (GST_DEVICE_PROVIDER (self), gst_device_provider_hide_provider (GST_DEVICE_PROVIDER (self),
"alsadeviceprovider"); "alsadeviceprovider");
is_default = is_default_device_name (self, info->name,
GST_PULSE_DEVICE_TYPE_SOURCE);
return gst_pulse_device_new (info->index, info->description, return gst_pulse_device_new (info->index, info->description,
caps, info->name, GST_PULSE_DEVICE_TYPE_SOURCE, props, caps, info->name, GST_PULSE_DEVICE_TYPE_SOURCE, props, is_default);
!g_strcmp0 (info->name, self->default_source_name));
} }
static GstDevice * static GstDevice *
@ -222,6 +248,8 @@ new_sink (GstPulseDeviceProvider * self, const pa_sink_info * info)
GstCaps *caps; GstCaps *caps;
GstStructure *props; GstStructure *props;
guint i; guint i;
gboolean is_default = FALSE;
caps = gst_caps_new_empty (); caps = gst_caps_new_empty ();
@ -230,9 +258,11 @@ new_sink (GstPulseDeviceProvider * self, const pa_sink_info * info)
props = gst_pulse_make_structure (info->proplist); props = gst_pulse_make_structure (info->proplist);
is_default = is_default_device_name (self, info->name,
GST_PULSE_DEVICE_TYPE_SINK);
return gst_pulse_device_new (info->index, info->description, return gst_pulse_device_new (info->index, info->description,
caps, info->name, GST_PULSE_DEVICE_TYPE_SINK, props, caps, info->name, GST_PULSE_DEVICE_TYPE_SINK, props, is_default);
!g_strcmp0 (info->name, self->default_sink_name));
} }
static void static void
@ -280,10 +310,14 @@ get_server_info_cb (pa_context * context, const pa_server_info * info,
gst_structure_get_boolean (props, "is-default", &was_default); gst_structure_get_boolean (props, "is-default", &was_default);
switch (dev->type) { switch (dev->type) {
case GST_PULSE_DEVICE_TYPE_SINK: case GST_PULSE_DEVICE_TYPE_SINK:
is_default = !g_strcmp0 (dev->internal_name, self->default_sink_name); is_default =
is_default_device_name (self, dev->internal_name,
GST_PULSE_DEVICE_TYPE_SINK);
break; break;
case GST_PULSE_DEVICE_TYPE_SOURCE: case GST_PULSE_DEVICE_TYPE_SOURCE:
is_default = !g_strcmp0 (dev->internal_name, self->default_source_name); is_default =
is_default_device_name (self, dev->internal_name,
GST_PULSE_DEVICE_TYPE_SOURCE);
break; break;
} }