move queue from core to the elements plugin ç

Original commit message from CVS:

* gst/gst.c:
* plugins/elements/Makefile.am:
* plugins/elements/gstelements.c:
* plugins/elements/gstqueue.c:
move queue from core to the elements plugin

ç

diff --git a/ChangeLog b/ChangeLog
index 8e10733..f994eaf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-29  Thomas Vander Stichele  <thomas (at) apestaart (dot) org>
+
+       * gst/gst.c:
+       * plugins/elements/Makefile.am:
+       * plugins/elements/gstelements.c:
+       * plugins/elements/gstqueue.c:
+         move queue from core to the elements plugin
+
 2005-11-29  Andy Wingo  <wingo@pobox.com>
 
        * libs/gst/base/gstbasetransform.h: 

diff --git a/gst/gst.c b/gst/gst.c
index fcb285a..feb522d 100644 (file)
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -109,7 +109,6 @@
 #include <locale.h>             /* for LC_ALL */
 
 #include "gst.h"
-#include "gstqueue.h"
 
 #define GST_CAT_DEFAULT GST_CAT_GST_INIT
 
@@ -505,8 +504,7 @@ gst_register_core_elements (GstPlugin * plugin)
   if (!gst_element_register (plugin, "bin", GST_RANK_PRIMARY,
           GST_TYPE_BIN) ||
       !gst_element_register (plugin, "pipeline", GST_RANK_PRIMARY,
-          GST_TYPE_PIPELINE) ||
-      !gst_element_register (plugin, "queue", GST_RANK_NONE, GST_TYPE_QUEUE)
+          GST_TYPE_PIPELINE)
       )
     g_assert_not_reached ();
 

diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index d142d0e..bd0073e 100644 (file)
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -16,13 +16,14 @@ libgstelements_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_MAJORMINO
 libgstelements_la_SOURCES =    \
        gstbufferstore.c        \
        gstcapsfilter.c         \
+       gstelements.c           \
        gstfakesrc.c            \
        gstfakesink.c           \
        $(GSTFDSRC)             \
        gstfilesink.c           \
        gstfilesrc.c            \
        gstidentity.c           \
-       gstelements.c           \
+       gstqueue.c              \
        gsttee.c                \
        gsttypefindelement.c
 
@@ -40,6 +41,7 @@ noinst_HEADERS =              \
        gstfilesink.h           \
        gstfilesrc.h            \
        gstidentity.h           \
+       gstqueue.h              \
        gsttee.h                \
        gsttypefindelement.h
 

diff --git a/plugins/elements/gstelements.c b/plugins/elements/gstelements.c
index e719454..bb8d974 100644 (file)
--- a/plugins/elements/gstelements.c
+++ b/plugins/elements/gstelements.c
@@ -33,6 +33,7 @@
 #include "gstfilesink.h"
 #include "gstfilesrc.h"
 #include "gstidentity.h"
+#include "gstqueue.h"
 #include "gsttee.h"
 #include "gsttypefindelement.h"
 
@@ -56,6 +57,7 @@ static struct _elements_entry _elements[] = {
 #endif
   {"filesrc", GST_RANK_NONE, gst_file_src_get_type},
   {"identity", GST_RANK_NONE, gst_identity_get_type},
+  {"queue", GST_RANK_NONE, gst_queue_get_type},
   {"filesink", GST_RANK_NONE, gst_file_sink_get_type},
   {"tee", GST_RANK_NONE, gst_tee_get_type},
   {"typefind", GST_RANK_NONE, gst_type_find_element_get_type},

diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index f23a0f4..067d113 100644 (file)
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -37,14 +37,12 @@
  * The queue blocks by default.
  */
 
-#include "gst_private.h"
+#include "gst/gst_private.h"
 
+#include <gst/gst.h>
 #include "gstqueue.h"
-#include "gstevent.h"
-#include "gstinfo.h"
-#include "gsterror.h"
-#include "gstutils.h"
-#include "gst-i18n-lib.h"
+
+#include "../../gst/gst-i18n-lib.h"
 
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,