elements: add dataurisrc to build

Moved from -bad.

diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index db4d38c..3d11dbe 100644 (file)
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -5,6 +5,7 @@ libgstcoreelements_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_API_V
 libgstcoreelements_la_SOURCES =        \
        gstcapsfilter.c         \
        gstconcat.c             \
+       gstdataurisrc.c         \
        gstdownloadbuffer.c     \
        gstelements.c           \
        gstelements_private.c   \
@@ -37,6 +38,7 @@ libgstcoreelements_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 noinst_HEADERS =               \
        gstcapsfilter.h         \
        gstconcat.h             \
+       gstdataurisrc.h         \
        gstdownloadbuffer.h     \
        gstelements_private.h   \
        gstfakesink.h           \

diff --git a/plugins/elements/gstdataurisrc.c b/plugins/elements/gstdataurisrc.c
index 11ed4da..d63e437 100644 (file)
--- a/plugins/elements/gstdataurisrc.c
+++ b/plugins/elements/gstdataurisrc.c
@@ -1,5 +1,4 @@
-/* GStreamer
- *
+/* GStreamer data:// uri source element
  * Copyright (C) 2009 Igalia S.L
  * Copyright (C) 2009 Sebastian Dröge <sebastian.droege@collabora.co.uk>
  *
@@ -462,16 +461,3 @@ gst_data_uri_src_handler_init (gpointer g_iface, gpointer iface_data)
   iface->get_uri = gst_data_uri_src_get_uri;
   iface->set_uri = gst_data_uri_src_set_uri;
 }
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  return gst_element_register (plugin, "dataurisrc",
-      GST_RANK_PRIMARY, GST_TYPE_DATA_URI_SRC);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    dataurisrc,
-    "data: URI source",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);

diff --git a/plugins/elements/gstelements.c b/plugins/elements/gstelements.c
index 5c07855..57f989d 100644 (file)
--- a/plugins/elements/gstelements.c
+++ b/plugins/elements/gstelements.c
@@ -29,6 +29,7 @@
 
 #include "gstcapsfilter.h"
 #include "gstconcat.h"
+#include "gstdataurisrc.h"
 #include "gstdownloadbuffer.h"
 #include "gstfakesink.h"
 #include "gstfakesrc.h"
@@ -57,6 +58,9 @@ plugin_init (GstPlugin * plugin)
   if (!gst_element_register (plugin, "concat", GST_RANK_NONE,
           gst_concat_get_type ()))
     return FALSE;
+  if (!gst_element_register (plugin, "dataurisrc", GST_RANK_PRIMARY,
+          gst_data_uri_src_get_type ()))
+    return FALSE;
   if (!gst_element_register (plugin, "downloadbuffer", GST_RANK_NONE,
           gst_download_buffer_get_type ()))
     return FALSE;