From fa94322349808e6c4fac1e48204fd5602f4e99e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Tue, 13 May 2014 19:30:38 +0100
Subject: [PATCH] sparsefile: keep it private as helper API for downloadbuffer

There's no expectation that any other element or applications
might want to use this helper API any time soon, so keep it
private for the time being. There were open questions regarding
portability and binding-friendliness too.

This also removes the gio dependency of -base again.

https://bugzilla.gnome.org/show_bug.cgi?id=729951
https://bugzilla.gnome.org/show_bug.cgi?id=729949
---
 docs/libs/gstreamer-libs-sections.txt            | 16 ----------------
 libs/gst/base/Makefile.am                        |  4 +---
 plugins/elements/Makefile.am                     |  2 ++
 plugins/elements/gstdownloadbuffer.h             |  2 +-
 .../base => plugins/elements}/gstsparsefile.c    |  0
 .../base => plugins/elements}/gstsparsefile.h    |  0
 tests/check/libs/sparsefile.c                    |  3 ++-
 win32/common/libgstbase.def                      |  9 ---------
 8 files changed, 6 insertions(+), 30 deletions(-)
 rename {libs/gst/base => plugins/elements}/gstsparsefile.c (100%)
 rename {libs/gst/base => plugins/elements}/gstsparsefile.h (100%)

diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt
index e6eee1ff42..fbc0a71662 100644
--- a/docs/libs/gstreamer-libs-sections.txt
+++ b/docs/libs/gstreamer-libs-sections.txt
@@ -840,22 +840,6 @@ gst_queue_array_drop_element
 gst_queue_array_find
 </SECTION>
 
-<SECTION>
-<FILE>gstsparsefile</FILE>
-<TITLE>GstSparseFile</TITLE>
-<INCLUDE>gst/base/gstsparsefile.h</INCLUDE>
-GstSparseFile
-gst_sparse_file_new
-gst_sparse_file_free
-gst_sparse_file_set_fd
-gst_sparse_file_clear
-gst_sparse_file_write
-gst_sparse_file_read
-gst_sparse_file_n_ranges
-gst_sparse_file_get_range_before
-gst_sparse_file_get_range_after
-</SECTION>
-
 # net
 
 <SECTION>
diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am
index 1628b60ba8..650b97f17d 100644
--- a/libs/gst/base/Makefile.am
+++ b/libs/gst/base/Makefile.am
@@ -11,7 +11,6 @@ libgstbase_@GST_API_VERSION@_la_SOURCES = \
 	gstbitreader.c		\
 	gstbytereader.c		\
 	gstbytewriter.c         \
-	gstsparsefile.c         \
 	gstcollectpads.c	\
 	gstdataqueue.c		\
 	gstpushsrc.c		\
@@ -19,7 +18,7 @@ libgstbase_@GST_API_VERSION@_la_SOURCES = \
 	gsttypefindhelper.c
 
 libgstbase_@GST_API_VERSION@_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstbase_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(GIO_LIBS)
+libgstbase_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS)
 libgstbase_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 libgstbase_@GST_API_VERSION@includedir =		\
@@ -35,7 +34,6 @@ libgstbase_@GST_API_VERSION@include_HEADERS =	\
 	gstbitreader.h		\
 	gstbytereader.h		\
 	gstbytewriter.h         \
-	gstsparsefile.h         \
 	gstcollectpads.h	\
 	gstdataqueue.h		\
 	gstpushsrc.h		\
diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index c1df7dbe99..164c4a9e29 100644
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -19,6 +19,7 @@ libgstcoreelements_la_SOURCES =	\
 	gstmultiqueue.c		\
 	gstqueue.c		\
 	gstqueue2.c		\
+	gstsparsefile.c		\
 	gsttee.c		\
 	gsttypefindelement.c	\
 	gstvalve.c
@@ -46,6 +47,7 @@ noinst_HEADERS =		\
 	gstmultiqueue.h		\
 	gstqueue.h		\
 	gstqueue2.h		\
+	gstsparsefile.h		\
 	gsttee.h		\
 	gsttypefindelement.h	\
 	gstvalve.h
diff --git a/plugins/elements/gstdownloadbuffer.h b/plugins/elements/gstdownloadbuffer.h
index 7ff0ba07da..f38cdd9b6e 100644
--- a/plugins/elements/gstdownloadbuffer.h
+++ b/plugins/elements/gstdownloadbuffer.h
@@ -24,7 +24,7 @@
 #include <gst/gst.h>
 #include <stdio.h>
 
-#include <gst/base/gstsparsefile.h>
+#include "gstsparsefile.h"
 
 G_BEGIN_DECLS
 
diff --git a/libs/gst/base/gstsparsefile.c b/plugins/elements/gstsparsefile.c
similarity index 100%
rename from libs/gst/base/gstsparsefile.c
rename to plugins/elements/gstsparsefile.c
diff --git a/libs/gst/base/gstsparsefile.h b/plugins/elements/gstsparsefile.h
similarity index 100%
rename from libs/gst/base/gstsparsefile.h
rename to plugins/elements/gstsparsefile.h
diff --git a/tests/check/libs/sparsefile.c b/tests/check/libs/sparsefile.c
index c8cc78c6ad..6d291b44bf 100644
--- a/tests/check/libs/sparsefile.c
+++ b/tests/check/libs/sparsefile.c
@@ -28,7 +28,8 @@
 
 #include <gst/check/gstcheck.h>
 
-#include <gst/base/gstsparsefile.h>
+/* not public API for now */
+#include "../../../plugins/elements/gstsparsefile.c"
 
 static void
 expect_range_before (GstSparseFile * file, gsize offset, gsize start,
diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def
index 75a27bf5e0..8049a96b4f 100644
--- a/win32/common/libgstbase.def
+++ b/win32/common/libgstbase.def
@@ -272,15 +272,6 @@ EXPORTS
 	gst_queue_array_peek_head
 	gst_queue_array_pop_head
 	gst_queue_array_push_tail
-	gst_sparse_file_clear
-	gst_sparse_file_free
-	gst_sparse_file_get_range_after
-	gst_sparse_file_get_range_before
-	gst_sparse_file_n_ranges
-	gst_sparse_file_new
-	gst_sparse_file_read
-	gst_sparse_file_set_fd
-	gst_sparse_file_write
 	gst_type_find_helper
 	gst_type_find_helper_for_buffer
 	gst_type_find_helper_for_data