[gst-cvs] gst-openmax: basesink, basesrc: fix library and component name

[Felipe Contreras]

Module: gst-openmax
Branch: master
Commit: 43fe282a12089f4c1607be14765b7b6a824ea1fe
URL:    http://cgit.freedesktop.org/gstreamer/gst-openmax/commit/?id=43fe282a12089f4c1607be14765b7b6a824ea1fe

Author: Felipe Contreras <felipe.contreras at gmail.com>
Date:   Tue Mar 31 20:49:38 2009 +0300

basesink,basesrc: fix library and component name

It wasn't really being setup due to a previous commit.

Signed-off-by: Felipe Contreras <felipe.contreras at gmail.com>

---

 omx/gstomx.h           |    2 --
 omx/gstomx_base_sink.c |   10 +++++++++-
 omx/gstomx_base_src.c  |   11 ++++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/omx/gstomx.h b/omx/gstomx.h
index 77cee5d..7d5fa04 100644
--- a/omx/gstomx.h
+++ b/omx/gstomx.h
@@ -26,8 +26,6 @@
 
 G_BEGIN_DECLS
 
-#define DEFAULT_LIBRARY_NAME "libomxil-bellagio.so.0"
-
 GST_DEBUG_CATEGORY_EXTERN (gstomx_debug);
 GST_DEBUG_CATEGORY_EXTERN (gstomx_util_debug);
 #define GST_CAT_DEFAULT gstomx_debug
diff --git a/omx/gstomx_base_sink.c b/omx/gstomx_base_sink.c
index e0bffbc..b196d2c 100644
--- a/omx/gstomx_base_sink.c
+++ b/omx/gstomx_base_sink.c
@@ -423,7 +423,15 @@ type_instance_init (GTypeInstance *instance,
         gomx->client_data = self;
     }
 
-    self->omx_library = g_strdup (DEFAULT_LIBRARY_NAME);
+    {
+        const char *tmp;
+        tmp = g_type_get_qdata (G_OBJECT_CLASS_TYPE (g_class),
+                                g_quark_from_static_string ("library-name"));
+        self->omx_library = g_strdup (tmp);
+        tmp = g_type_get_qdata (G_OBJECT_CLASS_TYPE (g_class),
+                                g_quark_from_static_string ("component-name"));
+        self->omx_component = g_strdup (tmp);
+    }
 
     {
         GstPad *sinkpad;
diff --git a/omx/gstomx_base_src.c b/omx/gstomx_base_src.c
index 71e8119..0558c02 100644
--- a/omx/gstomx_base_src.c
+++ b/omx/gstomx_base_src.c
@@ -463,7 +463,16 @@ type_instance_init (GTypeInstance *instance,
         gomx->client_data = self;
     }
 
-    self->omx_library = g_strdup (DEFAULT_LIBRARY_NAME);
+    {
+        const char *tmp;
+        tmp = g_type_get_qdata (G_OBJECT_CLASS_TYPE (g_class),
+                                g_quark_from_static_string ("library-name"));
+        self->omx_library = g_strdup (tmp);
+        tmp = g_type_get_qdata (G_OBJECT_CLASS_TYPE (g_class),
+                                g_quark_from_static_string ("component-name"));
+        self->omx_component = g_strdup (tmp);
+    }
+
 
     GST_LOG_OBJECT (self, "end");
 }