From 434e7042d89731b78ee354b4cd112743ce92dec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 7 Oct 2011 13:54:51 +0100 Subject: [PATCH] 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 ++ .../base => plugins/elements}/gstdataqueue.c | 0 .../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(-) rename {libs/gst/base => plugins/elements}/gstdataqueue.c (100%) rename {libs/gst/base => plugins/elements}/gstdataqueue.h (100%) diff --git a/docs/libs/gstreamer-libs-docs.sgml b/docs/libs/gstreamer-libs-docs.sgml index 8f8496631a..ee1b06ba12 100644 --- a/docs/libs/gstreamer-libs-docs.sgml +++ b/docs/libs/gstreamer-libs-docs.sgml @@ -45,7 +45,6 @@ - diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt index 1e9e9680fe..94233aa88a 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 -
-gstdataqueue -GstDataQueue -gst/base/gstdataqueue.h -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 - -GstDataQueueClass -GST_DATA_QUEUE -GST_IS_DATA_QUEUE -GST_TYPE_DATA_QUEUE -GST_DATA_QUEUE_CLASS -GST_IS_DATA_QUEUE_CLASS - -gst_data_queue_get_type -
- # net
diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am index 9a5f50ead5..f603cbb76b 100644 --- a/libs/gst/base/Makefile.am +++ b/libs/gst/base/Makefile.am @@ -13,8 +13,7 @@ libgstbase_@GST_MAJORMINOR@_la_SOURCES = \ gstbytewriter.c \ gstcollectpads.c \ gstpushsrc.c \ - gsttypefindhelper.c \ - gstdataqueue.c + gsttypefindhelper.c libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) @@ -34,8 +33,7 @@ libgstbase_@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 f743cf2651..a4d4c81be1 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 bb3d840420..ee20a71539 100644 --- a/plugins/elements/gstmultiqueue.h +++ b/plugins/elements/gstmultiqueue.h @@ -24,7 +24,7 @@ #define __GST_MULTI_QUEUE_H__ #include -#include +#include "gstdataqueue.h" G_BEGIN_DECLS diff --git a/tests/check/libs/gstlibscpp.cc b/tests/check/libs/gstlibscpp.cc index 23079e8666..93f7451104 100644 --- a/tests/check/libs/gstlibscpp.cc +++ b/tests/check/libs/gstlibscpp.cc @@ -32,7 +32,6 @@ #include #include #include -#include #include #include diff --git a/tests/check/libs/libsabi.c b/tests/check/libs/libsabi.c index 0178539f4a..f302bc6d93 100644 --- a/tests/check/libs/libsabi.c +++ b/tests/check/libs/libsabi.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def index 3415da2f23..cbf27707de 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