[0.11] gstreamer: base: make GstDataQueue private API for multiqueue
Tim Müller
tpm at kemper.freedesktop.org
Fri Oct 7 06:12:49 PDT 2011
Module: gstreamer
Branch: 0.11
Commit: 434e7042d89731b78ee354b4cd112743ce92dec0
URL: http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=434e7042d89731b78ee354b4cd112743ce92dec0
Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date: Fri Oct 7 13:54:51 2011 +0100
base: make GstDataQueue private API for multiqueue
There's no code that uses it other than multiqueue, so make it private
to multiqueue for now. That way we can also do optimisations that
require API/ABI breaks. If anyone ever wants to use it, we can still
make it public again.
---
docs/libs/gstreamer-libs-docs.sgml | 1 -
docs/libs/gstreamer-libs-sections.txt | 32 --------------------
libs/gst/base/Makefile.am | 6 +--
plugins/elements/Makefile.am | 2 +
{libs/gst/base => plugins/elements}/gstdataqueue.c | 0
{libs/gst/base => plugins/elements}/gstdataqueue.h | 0
plugins/elements/gstmultiqueue.h | 2 +-
tests/check/libs/gstlibscpp.cc | 1 -
tests/check/libs/libsabi.c | 1 -
win32/common/libgstbase.def | 12 -------
10 files changed, 5 insertions(+), 52 deletions(-)
diff --git a/docs/libs/gstreamer-libs-docs.sgml b/docs/libs/gstreamer-libs-docs.sgml
index 8f84966..ee1b06b 100644
--- a/docs/libs/gstreamer-libs-docs.sgml
+++ b/docs/libs/gstreamer-libs-docs.sgml
@@ -45,7 +45,6 @@
<xi:include href="xml/gstbytewriter.xml" />
<xi:include href="xml/gstcollectpads.xml" />
<xi:include href="xml/gsttypefindhelper.xml" />
- <xi:include href="xml/gstdataqueue.xml" />
</chapter>
<chapter id="gstreamer-control">
diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt
index 1e9e968..94233aa 100644
--- a/docs/libs/gstreamer-libs-sections.txt
+++ b/docs/libs/gstreamer-libs-sections.txt
@@ -768,38 +768,6 @@ gst_type_find_helper_get_range_ext
<SUBSECTION Private>
</SECTION>
-<SECTION>
-<FILE>gstdataqueue</FILE>
-<TITLE>GstDataQueue</TITLE>
-<INCLUDE>gst/base/gstdataqueue.h</INCLUDE>
-GstDataQueue
-GstDataQueueSize
-GstDataQueueCheckFullFunction
-GstDataQueueItem
-GstDataQueueEmptyCallback
-GstDataQueueFullCallback
-gst_data_queue_new
-gst_data_queue_new_full
-gst_data_queue_push
-gst_data_queue_pop
-gst_data_queue_flush
-gst_data_queue_set_flushing
-gst_data_queue_drop_head
-gst_data_queue_is_full
-gst_data_queue_is_empty
-gst_data_queue_get_level
-gst_data_queue_limits_changed
-<SUBSECTION Standard>
-GstDataQueueClass
-GST_DATA_QUEUE
-GST_IS_DATA_QUEUE
-GST_TYPE_DATA_QUEUE
-GST_DATA_QUEUE_CLASS
-GST_IS_DATA_QUEUE_CLASS
-<SUBSECTION Private>
-gst_data_queue_get_type
-</SECTION>
-
# net
<SECTION>
diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am
index 9a5f50e..f603cbb 100644
--- a/libs/gst/base/Makefile.am
+++ b/libs/gst/base/Makefile.am
@@ -13,8 +13,7 @@ libgstbase_ at GST_MAJORMINOR@_la_SOURCES = \
gstbytewriter.c \
gstcollectpads.c \
gstpushsrc.c \
- gsttypefindhelper.c \
- gstdataqueue.c
+ gsttypefindhelper.c
libgstbase_ at GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstbase_ at GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
@@ -34,8 +33,7 @@ libgstbase_ at GST_MAJORMINOR@include_HEADERS = \
gstbytewriter.h \
gstcollectpads.h \
gstpushsrc.h \
- gsttypefindhelper.h \
- gstdataqueue.h
+ gsttypefindhelper.h
noinst_HEADERS = \
gstbytereader-docs.h \
diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index f743cf2..a4d4c81 100644
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -15,6 +15,7 @@ libgstcoreelements_la_SOURCES = \
gstidentity.c \
gstinputselector.c \
gstoutputselector.c \
+ gstdataqueue.c \
gstmultiqueue.c \
gstqueue.c \
gstqueue2.c \
@@ -41,6 +42,7 @@ noinst_HEADERS = \
gstidentity.h \
gstinputselector.h \
gstoutputselector.h \
+ gstdataqueue.h \
gstmultiqueue.h \
gstqueue.h \
gstqueue2.h \
diff --git a/libs/gst/base/gstdataqueue.c b/plugins/elements/gstdataqueue.c
similarity index 100%
rename from libs/gst/base/gstdataqueue.c
rename to plugins/elements/gstdataqueue.c
diff --git a/libs/gst/base/gstdataqueue.h b/plugins/elements/gstdataqueue.h
similarity index 100%
rename from libs/gst/base/gstdataqueue.h
rename to plugins/elements/gstdataqueue.h
diff --git a/plugins/elements/gstmultiqueue.h b/plugins/elements/gstmultiqueue.h
index bb3d840..ee20a71 100644
--- a/plugins/elements/gstmultiqueue.h
+++ b/plugins/elements/gstmultiqueue.h
@@ -24,7 +24,7 @@
#define __GST_MULTI_QUEUE_H__
#include <gst/gst.h>
-#include <gst/base/gstdataqueue.h>
+#include "gstdataqueue.h"
G_BEGIN_DECLS
diff --git a/tests/check/libs/gstlibscpp.cc b/tests/check/libs/gstlibscpp.cc
index 23079e8..93f7451 100644
--- a/tests/check/libs/gstlibscpp.cc
+++ b/tests/check/libs/gstlibscpp.cc
@@ -32,7 +32,6 @@
#include <gst/base/gstbytereader.h>
#include <gst/base/gstbytewriter.h>
#include <gst/base/gstcollectpads.h>
-#include <gst/base/gstdataqueue.h>
#include <gst/base/gstpushsrc.h>
#include <gst/base/gsttypefindhelper.h>
diff --git a/tests/check/libs/libsabi.c b/tests/check/libs/libsabi.c
index 0178539..f302bc6 100644
--- a/tests/check/libs/libsabi.c
+++ b/tests/check/libs/libsabi.c
@@ -30,7 +30,6 @@
#include <gst/base/gstbytereader.h>
#include <gst/base/gstbytewriter.h>
#include <gst/base/gstcollectpads.h>
-#include <gst/base/gstdataqueue.h>
#include <gst/base/gstpushsrc.h>
#include <gst/base/gsttypefindhelper.h>
#include <gst/controller/gstcontroller.h>
diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def
index 3415da2..cbf2770 100644
--- a/win32/common/libgstbase.def
+++ b/win32/common/libgstbase.def
@@ -222,18 +222,6 @@ EXPORTS
gst_collect_pads_start
gst_collect_pads_stop
gst_collect_pads_take_buffer
- gst_data_queue_drop_head
- gst_data_queue_flush
- gst_data_queue_get_level
- gst_data_queue_get_type
- gst_data_queue_is_empty
- gst_data_queue_is_full
- gst_data_queue_limits_changed
- gst_data_queue_new
- gst_data_queue_new_full
- gst_data_queue_pop
- gst_data_queue_push
- gst_data_queue_set_flushing
gst_push_src_get_type
gst_type_find_helper
gst_type_find_helper_for_buffer
More information about the gstreamer-commits
mailing list