From 94f6ba9c0bd59532f016cdda87ff749d7f36ef2a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 14 Jul 2012 19:24:57 +0100 Subject: [PATCH] base: make GstQueueArray private to coreelements for now Keep it private until we have a reason to make it public. --- libs/gst/base/Makefile.am | 6 ++---- plugins/elements/Makefile.am | 2 ++ plugins/elements/gstdataqueue.h | 2 +- plugins/elements/gstqueue.h | 2 +- {libs/gst/base => plugins/elements}/gstqueuearray.c | 0 {libs/gst/base => plugins/elements}/gstqueuearray.h | 0 tests/check/libs/queuearray.c | 3 ++- win32/common/libgstbase.def | 7 ------- 8 files changed, 8 insertions(+), 14 deletions(-) rename {libs/gst/base => plugins/elements}/gstqueuearray.c (100%) rename {libs/gst/base => plugins/elements}/gstqueuearray.h (100%) diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am index 3dbbb92..069f96b 100644 --- a/libs/gst/base/Makefile.am +++ b/libs/gst/base/Makefile.am @@ -13,8 +13,7 @@ libgstbase_@GST_API_VERSION@_la_SOURCES = \ gstbytewriter.c \ gstcollectpads.c \ gstpushsrc.c \ - gsttypefindhelper.c \ - gstqueuearray.c + gsttypefindhelper.c libgstbase_@GST_API_VERSION@_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstbase_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) @@ -34,8 +33,7 @@ libgstbase_@GST_API_VERSION@include_HEADERS = \ gstbytewriter.h \ gstcollectpads.h \ gstpushsrc.h \ - gsttypefindhelper.h \ - gstqueuearray.h + gsttypefindhelper.h noinst_HEADERS = \ gstbytereader-docs.h \ diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am index d451a1f..5e0230c 100644 --- a/plugins/elements/Makefile.am +++ b/plugins/elements/Makefile.am @@ -17,6 +17,7 @@ libgstcoreelements_la_SOURCES = \ gstoutputselector.c \ gstdataqueue.c \ gstmultiqueue.c \ + gstqueuearray.c \ gstqueue.c \ gstqueue2.c \ gsttee.c \ @@ -44,6 +45,7 @@ noinst_HEADERS = \ gstoutputselector.h \ gstdataqueue.h \ gstmultiqueue.h \ + gstqueuearray.h \ gstqueue.h \ gstqueue2.h \ gsttee.h \ diff --git a/plugins/elements/gstdataqueue.h b/plugins/elements/gstdataqueue.h index cc00a49..2921a32 100644 --- a/plugins/elements/gstdataqueue.h +++ b/plugins/elements/gstdataqueue.h @@ -24,7 +24,7 @@ #define __GST_DATA_QUEUE_H__ #include -#include +#include "gstqueuearray.h" G_BEGIN_DECLS #define GST_TYPE_DATA_QUEUE \ diff --git a/plugins/elements/gstqueue.h b/plugins/elements/gstqueue.h index 552a128..e959f42 100644 --- a/plugins/elements/gstqueue.h +++ b/plugins/elements/gstqueue.h @@ -25,7 +25,7 @@ #define __GST_QUEUE_H__ #include -#include +#include "gstqueuearray.h" G_BEGIN_DECLS diff --git a/libs/gst/base/gstqueuearray.c b/plugins/elements/gstqueuearray.c similarity index 100% rename from libs/gst/base/gstqueuearray.c rename to plugins/elements/gstqueuearray.c diff --git a/libs/gst/base/gstqueuearray.h b/plugins/elements/gstqueuearray.h similarity index 100% rename from libs/gst/base/gstqueuearray.h rename to plugins/elements/gstqueuearray.h diff --git a/tests/check/libs/queuearray.c b/tests/check/libs/queuearray.c index 3f21f3c..ca5024b 100644 --- a/tests/check/libs/queuearray.c +++ b/tests/check/libs/queuearray.c @@ -26,7 +26,8 @@ #include #include -#include +#include "../../../plugins/elements/gstqueuearray.h" +#include "../../../plugins/elements/gstqueuearray.c" /* Simplest test * Initial size : 10 diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def index e673588..8319104 100644 --- a/win32/common/libgstbase.def +++ b/win32/common/libgstbase.def @@ -237,13 +237,6 @@ EXPORTS gst_collect_pads_stop gst_collect_pads_take_buffer gst_push_src_get_type - gst_queue_array_drop_element - gst_queue_array_find - gst_queue_array_free - gst_queue_array_is_empty - gst_queue_array_new - gst_queue_array_pop_head - gst_queue_array_push_tail gst_type_find_helper gst_type_find_helper_for_buffer gst_type_find_helper_for_data -- 2.7.4