diff options
Diffstat (limited to 'gst/gstpluginfeature.c')
| -rw-r--r-- | gst/gstpluginfeature.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/gst/gstpluginfeature.c b/gst/gstpluginfeature.c index 79925a6..5b86fd3 100644 --- a/gst/gstpluginfeature.c +++ b/gst/gstpluginfeature.c @@ -114,8 +114,7 @@ gst_plugin_feature_load (GstPluginFeature * feature) GST_DEBUG ("loaded plugin %s", feature->plugin_name); gst_object_unref (plugin); - real_feature = - gst_registry_lookup_feature (gst_registry_get_default (), + real_feature = gst_registry_lookup_feature (gst_registry_get (), GST_OBJECT_NAME (feature)); if (real_feature == NULL) @@ -148,25 +147,6 @@ not_found: } /** - * gst_plugin_feature_type_name_filter: - * @feature: the #GstPluginFeature - * @data: (in): the type and name to check against - * - * Compares type and name of plugin feature. Can be used with gst_filter_run(). - * - * Returns: TRUE if equal. - */ -gboolean -gst_plugin_feature_type_name_filter (GstPluginFeature * feature, - GstTypeNameData * data) -{ - g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (feature), FALSE); - - return ((data->type == 0 || data->type == G_OBJECT_TYPE (feature)) && - (data->name == NULL || !strcmp (data->name, GST_OBJECT_NAME (feature)))); -} - -/** * gst_plugin_feature_set_rank: * @feature: feature to rank * @rank: rank value - higher number means more priority rank @@ -306,7 +286,7 @@ gst_plugin_feature_check_version (GstPluginFeature * feature, GST_DEBUG ("Looking up plugin '%s' containing plugin feature '%s'", feature->plugin_name, GST_OBJECT_NAME (feature)); - registry = gst_registry_get_default (); + registry = gst_registry_get (); plugin = gst_registry_find_plugin (registry, feature->plugin_name); if (plugin) { @@ -321,6 +301,15 @@ gst_plugin_feature_check_version (GstPluginFeature * feature, GST_DEBUG ("version string '%s' parsed to %d values", ver_str, nscan); if (nscan >= 3) { + /* FIXME 1.0: Remove this before doing the actual 1.0.0 release */ + if ((major == 0 && minor == 11 && micro >= 90) || + (major == 0 && minor == 11 && micro == 89 && nano > 0)) { + major = 1; + minor = 0; + micro = 0; + nano = 0; + } + if (major > min_major) ret = TRUE; else if (major < min_major) |