mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 23:48:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

deviceproviderfactory: handle NULL classes argument and match any

Browse source
This commit is contained in:
Tim-Philipp Müller 2014-06-27 10:44:01 +01:00
parent fc87c5df5e
commit 9b07b935a4
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/gstdeviceproviderfactory.c
View file

@ -462,8 +462,8 @@ gst_device_provider_factory_get_metadata_keys (GstDeviceProviderFactory *
/** /**
* gst_device_provider_factory_has_classesv: * gst_device_provider_factory_has_classesv:
* @factory: a #GstDeviceProviderFactory * @factory: a #GstDeviceProviderFactory
* @classes: (array zero-terminated=1): a %NULL terminated array of * @classes: (array zero-terminated=1) (allow-none): a %NULL terminated array
* klasses to match, only match if all classes are matched * of klasses to match, only match if all classes are matched
* *
* Check if @factory matches all of the given classes * Check if @factory matches all of the given classes
* *
@ -488,7 +488,7 @@ gst_device_provider_factory_has_classesv (GstDeviceProviderFactory * factory,
return FALSE; return FALSE;
} }
for (; classes[0]; classes++) { for (; classes != NULL && classes[0] != NULL; classes++) {
const gchar *found; const gchar *found;
guint len; guint len;
@ -513,12 +513,12 @@ gst_device_provider_factory_has_classesv (GstDeviceProviderFactory * factory,
/** /**
* gst_device_provider_factory_has_classes: * gst_device_provider_factory_has_classes:
* @factory: a #GstDeviceProviderFactory * @factory: a #GstDeviceProviderFactory
* @classes: a "/" separate list of klasses to match, only match if all classes * @classes: (allow-none): a "/" separate list of klasses to match, only match
* are matched * if all classes are matched
* *
* Check if @factory matches all of the given @classes * Check if @factory matches all of the given @classes
* *
* Returns: %TRUE if @factory matches. * Returns: %TRUE if @factory matches or if @classes is %NULL.
* *
* Since: 1.4 * Since: 1.4
*/ */
@ -529,6 +529,9 @@ gst_device_provider_factory_has_classes (GstDeviceProviderFactory * factory,
gchar **classesv; gchar **classesv;
gboolean res; gboolean res;
if (classes == NULL)
return TRUE;
classesv = g_strsplit (classes, "/", 0); classesv = g_strsplit (classes, "/", 0);
res = gst_device_provider_factory_has_classesv (factory, classesv); res = gst_device_provider_factory_has_classesv (factory, classesv);