X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgstpluginfeature.c;h=831236e2b11493a61b4efc4e3440447b3abbbc21;hb=b89b1802df44829a0c034db5807bc893ad3c7774;hp=88adc40959544b214edd9c1f895d509f78a53bdb;hpb=14f5518f3da03850158b1f931d6271aa9f6c2c4d;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/gst/gstpluginfeature.c b/gst/gstpluginfeature.c
index 88adc40..831236e 100644
--- a/gst/gstpluginfeature.c
+++ b/gst/gstpluginfeature.c
@@ -16,12 +16,13 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 /**
  * SECTION:gstpluginfeature
+ * @title: GstPluginfeature
  * @short_description: Base class for contents of a GstPlugin
  * @see_also: #GstPlugin
  *
@@ -63,8 +64,7 @@ gst_plugin_feature_finalize (GObject * object)
 {
   GstPluginFeature *feature = GST_PLUGIN_FEATURE_CAST (object);
 
-  GST_DEBUG ("finalizing feature %p: '%s'", feature,
-      GST_PLUGIN_FEATURE_NAME (feature));
+  GST_DEBUG ("finalizing feature %p: '%s'", feature, GST_OBJECT_NAME (feature));
 
   if (feature->plugin != NULL) {
     g_object_remove_weak_pointer ((GObject *) feature->plugin,
@@ -82,7 +82,7 @@ gst_plugin_feature_finalize (GObject * object)
  * unaffected; use the return value instead.
  *
  * Normally this function is used like this:
- * |[
+ * |[<!-- language="C" -->
  * GstPluginFeature *loaded_feature;
  *
  * loaded_feature = gst_plugin_feature_load (feature);
@@ -91,7 +91,8 @@ gst_plugin_feature_finalize (GObject * object)
  * feature = loaded_feature;
  * ]|
  *
- * Returns: (transfer full): a reference to the loaded feature, or NULL on error
+ * Returns: (transfer full) (nullable): a reference to the loaded
+ * feature, or %NULL on error
  */
 GstPluginFeature *
 gst_plugin_feature_load (GstPluginFeature * feature)
@@ -103,7 +104,7 @@ gst_plugin_feature_load (GstPluginFeature * feature)
   g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (feature), FALSE);
 
   GST_DEBUG ("loading plugin for feature %p; '%s'", feature,
-      GST_PLUGIN_FEATURE_NAME (feature));
+      GST_OBJECT_NAME (feature));
   if (feature->loaded)
     return gst_object_ref (feature);
 
@@ -115,8 +116,8 @@ 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 (), feature->name);
+  real_feature = gst_registry_lookup_feature (gst_registry_get (),
+      GST_OBJECT_NAME (feature));
 
   if (real_feature == NULL)
     goto disappeared;
@@ -129,115 +130,99 @@ gst_plugin_feature_load (GstPluginFeature * feature)
 load_failed:
   {
     GST_WARNING ("Failed to load plugin containing feature '%s'.",
-        GST_PLUGIN_FEATURE_NAME (feature));
+        GST_OBJECT_NAME (feature));
     return NULL;
   }
 disappeared:
   {
     GST_INFO
         ("Loaded plugin containing feature '%s', but feature disappeared.",
-        feature->name);
+        GST_OBJECT_NAME (feature));
     return NULL;
   }
 not_found:
   {
     GST_INFO ("Tried to load plugin containing feature '%s', but feature was "
-        "not found.", real_feature->name);
+        "not found.", GST_OBJECT_NAME (real_feature));
     return NULL;
   }
 }
 
 /**
- * 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().
+ * gst_plugin_feature_set_rank:
+ * @feature: feature to rank
+ * @rank: rank value - higher number means more priority rank
  *
- * Returns: TRUE if equal.
+ * Specifies a rank for a plugin feature, so that autoplugging uses
+ * the most appropriate feature.
  */
-gboolean
-gst_plugin_feature_type_name_filter (GstPluginFeature * feature,
-    GstTypeNameData * data)
+void
+gst_plugin_feature_set_rank (GstPluginFeature * feature, guint rank)
 {
-  g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (feature), FALSE);
+  g_return_if_fail (feature != NULL);
+  g_return_if_fail (GST_IS_PLUGIN_FEATURE (feature));
 
-  return ((data->type == 0 || data->type == G_OBJECT_TYPE (feature)) &&
-      (data->name == NULL
-          || !strcmp (data->name, GST_PLUGIN_FEATURE_NAME (feature))));
+  feature->rank = rank;
 }
 
 /**
- * gst_plugin_feature_set_name:
+ * gst_plugin_feature_get_rank:
  * @feature: a feature
- * @name: the name to set
  *
- * Sets the name of a plugin feature. The name uniquely identifies a feature
- * within all features of the same type. Renaming a plugin feature is not
- * allowed. A copy is made of the name so you should free the supplied @name
- * after calling this function.
+ * Gets the rank of a plugin feature.
+ *
+ * Returns: The rank of the feature
  */
-void
-gst_plugin_feature_set_name (GstPluginFeature * feature, const gchar * name)
+guint
+gst_plugin_feature_get_rank (GstPluginFeature * feature)
 {
-  g_return_if_fail (GST_IS_PLUGIN_FEATURE (feature));
-  g_return_if_fail (name != NULL);
+  g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (feature), GST_RANK_NONE);
 
-  if (G_UNLIKELY (feature->name)) {
-    g_return_if_fail (strcmp (feature->name, name) == 0);
-  } else {
-    gst_object_set_name (GST_OBJECT (feature), name);
-    feature->name = GST_OBJECT_NAME (GST_OBJECT (feature));
-  }
+  return feature->rank;
 }
 
 /**
- * gst_plugin_feature_get_name:
+ * gst_plugin_feature_get_plugin:
  * @feature: a feature
  *
- * Gets the name of a plugin feature.
+ * Get the plugin that provides this feature.
  *
- * Returns: the name
+ * Returns: (transfer full) (nullable): the plugin that provides this
+ *     feature, or %NULL.  Unref with gst_object_unref() when no
+ *     longer needed.
  */
-const gchar *
-gst_plugin_feature_get_name (GstPluginFeature * feature)
+GstPlugin *
+gst_plugin_feature_get_plugin (GstPluginFeature * feature)
 {
   g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (feature), NULL);
 
-  return feature->name;
-}
-
-/**
- * gst_plugin_feature_set_rank:
- * @feature: feature to rank
- * @rank: rank value - higher number means more priority rank
- *
- * Specifies a rank for a plugin feature, so that autoplugging uses
- * the most appropriate feature.
- */
-void
-gst_plugin_feature_set_rank (GstPluginFeature * feature, guint rank)
-{
-  g_return_if_fail (feature != NULL);
-  g_return_if_fail (GST_IS_PLUGIN_FEATURE (feature));
+  if (feature->plugin == NULL)
+    return NULL;
 
-  feature->rank = rank;
+  return (GstPlugin *) gst_object_ref (feature->plugin);
 }
 
 /**
- * gst_plugin_feature_get_rank:
+ * gst_plugin_feature_get_plugin_name:
  * @feature: a feature
  *
- * Gets the rank of a plugin feature.
+ * Get the name of the plugin that provides this feature.
  *
- * Returns: The rank of the feature
+ * Returns: (nullable): the name of the plugin that provides this
+ *     feature, or %NULL if the feature is not associated with a
+ *     plugin.
+ *
+ * Since: 1.2
  */
-guint
-gst_plugin_feature_get_rank (GstPluginFeature * feature)
+const gchar *
+gst_plugin_feature_get_plugin_name (GstPluginFeature * feature)
 {
-  g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (feature), GST_RANK_NONE);
+  g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (feature), NULL);
 
-  return feature->rank;
+  if (feature->plugin == NULL)
+    return NULL;
+
+  return gst_plugin_get_name (feature->plugin);
 }
 
 /**
@@ -270,8 +255,6 @@ gst_plugin_feature_list_free (GList * list)
  *
  * Returns: (transfer full) (element-type Gst.PluginFeature): a copy of @list,
  *     with each feature's reference count incremented.
- *
- * Since: 0.10.26
  */
 GList *
 gst_plugin_feature_list_copy (GList * list)
@@ -282,7 +265,7 @@ gst_plugin_feature_list_copy (GList * list)
     GList *last;
 
     new_list = g_list_alloc ();
-    new_list->data = g_object_ref ((GObject *) list->data);
+    new_list->data = gst_object_ref (list->data);
     new_list->prev = NULL;
     last = new_list;
     list = list->next;
@@ -290,7 +273,7 @@ gst_plugin_feature_list_copy (GList * list)
       last->next = g_list_alloc ();
       last->next->prev = last;
       last = last->next;
-      last->data = g_object_ref ((GObject *) list->data);
+      last->data = gst_object_ref (list->data);
       list = list->next;
     }
     last->next = NULL;
@@ -305,8 +288,6 @@ gst_plugin_feature_list_copy (GList * list)
  *     plugin features
  *
  * Debug the plugin feature names in @list.
- *
- * Since: 0.10.31
  */
 void
 gst_plugin_feature_list_debug (GList * list)
@@ -330,8 +311,8 @@ gst_plugin_feature_list_debug (GList * list)
  * Checks whether the given plugin feature is at least
  *  the required version
  *
- * Returns: #TRUE if the plugin feature has at least
- *  the required version, otherwise #FALSE.
+ * Returns: %TRUE if the plugin feature has at least
+ *  the required version, otherwise %FALSE.
  */
 gboolean
 gst_plugin_feature_check_version (GstPluginFeature * feature,
@@ -345,9 +326,9 @@ gst_plugin_feature_check_version (GstPluginFeature * feature,
   g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (feature), FALSE);
 
   GST_DEBUG ("Looking up plugin '%s' containing plugin feature '%s'",
-      feature->plugin_name, feature->name);
+      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) {
@@ -405,9 +386,7 @@ gst_plugin_feature_check_version (GstPluginFeature * feature,
  * Returns: negative value if the rank of p1 > the rank of p2 or the ranks are
  * equal but the name of p1 comes before the name of p2; zero if the rank
  * and names are equal; positive value if the rank of p1 < the rank of p2 or the
- * ranks are equal but the name of p2 comes after the name of p1
- *
- * Since: 0.10.31
+ * ranks are equal but the name of p2 comes before the name of p1
  */
 gint
 gst_plugin_feature_rank_compare_func (gconstpointer p1, gconstpointer p2)
@@ -422,7 +401,7 @@ gst_plugin_feature_rank_compare_func (gconstpointer p1, gconstpointer p2)
   if (diff != 0)
     return diff;
 
-  diff = strcmp (f2->name, f1->name);
+  diff = strcmp (GST_OBJECT_NAME (f1), GST_OBJECT_NAME (f2));
 
   return diff;
 }