diff options
author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2014-06-26 14:28:09 -0400 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2014-06-26 14:45:30 -0400 |
commit | 7992174a1a367c2f3cf3bc53fc1bd76fd8a365d0 (patch) | |
tree | 4a58fd47fda6fe8c082ac3ef0f46866256b1b0b4 /gst/gstregistry.c | |
parent | 4720e6d0e0327fe5e8cf83e03a00e57540b6c943 (diff) |
DeviceProvider: Rename from DeviceMonitor
Diffstat (limited to 'gst/gstregistry.c')
-rw-r--r-- | gst/gstregistry.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gst/gstregistry.c b/gst/gstregistry.c index 7d612f83d0..73fdf0edbe 100644 --- a/gst/gstregistry.c +++ b/gst/gstregistry.c @@ -127,7 +127,7 @@ #include "gstinfo.h" #include "gsterror.h" #include "gstregistry.h" -#include "gstdevicemonitorfactory.h" +#include "gstdeviceproviderfactory.h" #include "gstpluginloader.h" @@ -166,7 +166,7 @@ struct _GstRegistryPrivate guint32 efl_cookie; GList *typefind_factory_list; guint32 tfl_cookie; - GList *device_monitor_factory_list; + GList *device_provider_factory_list; guint32 dmfl_cookie; }; @@ -317,10 +317,10 @@ gst_registry_finalize (GObject * object) gst_plugin_feature_list_free (registry->priv->typefind_factory_list); } - if (registry->priv->device_monitor_factory_list) { + if (registry->priv->device_provider_factory_list) { GST_DEBUG_OBJECT (registry, - "Cleaning up cached device monitor factory list"); - gst_plugin_feature_list_free (registry->priv->device_monitor_factory_list); + "Cleaning up cached device provider factory list"); + gst_plugin_feature_list_free (registry->priv->device_provider_factory_list); } G_OBJECT_CLASS (parent_class)->finalize (object); @@ -789,20 +789,20 @@ gst_registry_get_typefind_factory_list (GstRegistry * registry) static GList * -gst_registry_get_device_monitor_factory_list (GstRegistry * registry) +gst_registry_get_device_provider_factory_list (GstRegistry * registry) { GList *list; GST_OBJECT_LOCK (registry); gst_registry_get_feature_list_or_create (registry, - ®istry->priv->device_monitor_factory_list, - ®istry->priv->dmfl_cookie, GST_TYPE_DEVICE_MONITOR_FACTORY); + ®istry->priv->device_provider_factory_list, + ®istry->priv->dmfl_cookie, GST_TYPE_DEVICE_PROVIDER_FACTORY); /* Return reffed copy */ list = gst_plugin_feature_list_copy (registry-> - priv->device_monitor_factory_list); + priv->device_provider_factory_list); GST_OBJECT_UNLOCK (registry); @@ -953,8 +953,8 @@ gst_registry_get_feature_list (GstRegistry * registry, GType type) return gst_registry_get_element_factory_list (registry); else if (type == GST_TYPE_TYPE_FIND_FACTORY) return gst_registry_get_typefind_factory_list (registry); - else if (type == GST_TYPE_DEVICE_MONITOR_FACTORY) - return gst_registry_get_device_monitor_factory_list (registry); + else if (type == GST_TYPE_DEVICE_PROVIDER_FACTORY) + return gst_registry_get_device_provider_factory_list (registry); data.type = type; data.name = NULL; |