From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Sat, 29 Sep 2012 12:21:18 +0000 (+0100)
Subject: frei0r: fix plugin loading for frei0r elements that have no info.explanation
X-Git-Tag: 1.19.3~507^2~14871
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1f7171aa92964743578b73df3018275c74df492;p=platform%2Fupstream%2Fgstreamer.git

frei0r: fix plugin loading for frei0r elements that have no info.explanation

We don't allow empty descriptions for elements any more.
---

diff --git a/gst/frei0r/gstfrei0rfilter.c b/gst/frei0r/gstfrei0rfilter.c
index 91d2fe4..99c1238 100644
--- a/gst/frei0r/gstfrei0rfilter.c
+++ b/gst/frei0r/gstfrei0rfilter.c
@@ -185,6 +185,7 @@ gst_frei0r_filter_class_init (GstFrei0rFilterClass * klass,
   GstElementClass *gstelement_class = (GstElementClass *) klass;
   GstBaseTransformClass *gsttrans_class = (GstBaseTransformClass *) klass;
   GstPadTemplate *templ;
+  const gchar *desc;
   GstCaps *caps;
   gchar *author;
 
@@ -205,8 +206,11 @@ gst_frei0r_filter_class_init (GstFrei0rFilterClass * klass,
       g_strdup_printf
       ("Sebastian Dröge <sebastian.droege@collabora.co.uk>, %s",
       class_data->info.author);
+  desc = class_data->info.explanation;
+  if (desc == NULL || *desc == '\0')
+    desc = "No details";
   gst_element_class_set_metadata (gstelement_class, class_data->info.name,
-      "Filter/Effect/Video", class_data->info.explanation, author);
+      "Filter/Effect/Video", desc, author);
   g_free (author);
 
   caps = gst_frei0r_caps_from_color_model (class_data->info.color_model);
diff --git a/gst/frei0r/gstfrei0rmixer.c b/gst/frei0r/gstfrei0rmixer.c
index 490e8ed..d3fe248 100644
--- a/gst/frei0r/gstfrei0rmixer.c
+++ b/gst/frei0r/gstfrei0rmixer.c
@@ -613,6 +613,7 @@ gst_frei0r_mixer_class_init (GstFrei0rMixerClass * klass,
   GObjectClass *gobject_class = (GObjectClass *) klass;
   GstElementClass *gstelement_class = (GstElementClass *) klass;
   GstPadTemplate *templ;
+  const gchar *desc;
   GstCaps *caps;
   gchar *author;
 
@@ -633,8 +634,11 @@ gst_frei0r_mixer_class_init (GstFrei0rMixerClass * klass,
       g_strdup_printf
       ("Sebastian Dröge <sebastian.droege@collabora.co.uk>, %s",
       class_data->info.author);
+  desc = class_data->info.explanation;
+  if (desc == NULL || *desc == '\0')
+    desc = "No details";
   gst_element_class_set_metadata (gstelement_class, class_data->info.name,
-      "Filter/Editor/Video", class_data->info.explanation, author);
+      "Filter/Editor/Video", desc, author);
   g_free (author);
 
   caps = gst_frei0r_caps_from_color_model (class_data->info.color_model);
diff --git a/gst/frei0r/gstfrei0rsrc.c b/gst/frei0r/gstfrei0rsrc.c
index c1d57a9..d7785a8 100644
--- a/gst/frei0r/gstfrei0rsrc.c
+++ b/gst/frei0r/gstfrei0rsrc.c
@@ -316,6 +316,7 @@ gst_frei0r_src_class_init (GstFrei0rSrcClass * klass,
   GstPushSrcClass *gstpushsrc_class = (GstPushSrcClass *) klass;
   GstBaseSrcClass *gstbasesrc_class = (GstBaseSrcClass *) klass;
   GstPadTemplate *templ;
+  const gchar *desc;
   GstCaps *caps;
   gchar *author;
 
@@ -336,8 +337,11 @@ gst_frei0r_src_class_init (GstFrei0rSrcClass * klass,
       g_strdup_printf
       ("Sebastian Dröge <sebastian.droege@collabora.co.uk>, %s",
       class_data->info.author);
+  desc = class_data->info.explanation;
+  if (desc == NULL || *desc == '\0')
+    desc = "No details";
   gst_element_class_set_metadata (gstelement_class, class_data->info.name,
-      "Src/Video", class_data->info.explanation, author);
+      "Src/Video", desc, author);
   g_free (author);
 
   caps = gst_frei0r_caps_from_color_model (class_data->info.color_model);