[gst-cvs] thomasvs gstreamer: gstreamer/ gstreamer/gst/ gstreamer/plugins/elements/

[<tho...@fr...>]

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     thomasvs
Date:           Tue Nov 29 2005  11:47:14 PST

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

Modified files:
    .               : ChangeLog
    gst             : gst.c
    plugins/elements: Makefile.am gstelements.c gstqueue.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2055&r2=1.2056
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst.c.diff?r1=1.188&r2=1.189
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/Makefile.am.diff?r1=1.78&r2=1.79
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstelements.c.diff?r1=1.72&r2=1.73
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstqueue.c.diff?r1=1.166&r2=1.167

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.2055
retrieving revision 1.2056
diff -u -d -r1.2055 -r1.2056
--- ChangeLog	29 Nov 2005 19:37:49 -0000	1.2055
+++ ChangeLog	29 Nov 2005 19:47:00 -0000	1.2056
@@ -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  <wi...@po...>
 
 	* libs/gst/base/gstbasetransform.h: 
Index: gst.c
RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- gst.c	24 Nov 2005 09:44:06 -0000	1.188
+++ gst.c	29 Nov 2005 19:47:00 -0000	1.189
@@ -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 @@
   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 ();
Index: Makefile.am
RCS file: /cvs/gstreamer/gstreamer/plugins/elements/Makefile.am,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Makefile.am	29 Nov 2005 19:12:30 -0000	1.78
+++ Makefile.am	29 Nov 2005 19:47:00 -0000	1.79
@@ -16,13 +16,14 @@
 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 @@
 	gstfilesink.h		\
 	gstfilesrc.h		\
 	gstidentity.h		\
+	gstqueue.h		\
 	gsttee.h		\
 	gsttypefindelement.h
Index: gstelements.c
RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstelements.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- gstelements.c	16 Oct 2005 09:20:52 -0000	1.72
+++ gstelements.c	29 Nov 2005 19:47:00 -0000	1.73
@@ -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 @@
 #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},
Index: gstqueue.c
RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstqueue.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- gstqueue.c	28 Nov 2005 19:58:56 -0000	1.166
+++ gstqueue.c	29 Nov 2005 19:47:00 -0000	1.167
@@ -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,