From 2d7150414b3524c06b6a5c13e635fc15191b888c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Sun, 25 Dec 2011 23:19:57 +0000
Subject: [PATCH] gdp: move dataprotocol library into gdp plugin and make
 private

We have removed things like protocol=gdp in the tcp elements
in favour of explicit gdppay/depay elements, so there's no need
to keep a public API and library for now. We can still add it
back later. Someone needs to think hard about 0.11 and gdp
anyway one of these days.
---
 gst/gdp/Makefile.am             | 11 +++++++----
 gst/gdp/dataprotocol.c          |  2 +-
 gst/gdp/dp-private.h            |  2 ++
 gst/gdp/gstgdp.c                |  2 +-
 gst/gdp/gstgdpdepay.c           |  2 +-
 gst/gdp/gstgdppay.c             |  2 +-
 tests/check/elements/gdpdepay.c |  2 +-
 tests/check/elements/gdppay.c   |  2 +-
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/gst/gdp/Makefile.am b/gst/gdp/Makefile.am
index a8aba8b440..990f967d36 100644
--- a/gst/gdp/Makefile.am
+++ b/gst/gdp/Makefile.am
@@ -1,18 +1,21 @@
 plugin_LTLIBRARIES = libgstgdp.la
 
 libgstgdp_la_SOURCES = \
+	dataprotocol.c \
 	gstgdp.c \
 	gstgdppay.c \
 	gstgdpdepay.c
 
 libgstgdp_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstgdp_la_LIBADD = $(GST_BASE_LIBS) $(GST_GDP_LIBS)
+libgstgdp_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstgdp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstgdp_la_LIBTOOLFLAGS = --tag=disable-static
 
-noinst_HEADERS =			\
-		 gstgdppay.h		\
-		 gstgdpdepay.h
+noinst_HEADERS = \
+	dataprotocol.h \
+	dp-private.h   \
+	gstgdppay.h    \
+	gstgdpdepay.h
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/gdp/dataprotocol.c b/gst/gdp/dataprotocol.c
index 3b2e182202..0308df9a09 100644
--- a/gst/gdp/dataprotocol.c
+++ b/gst/gdp/dataprotocol.c
@@ -71,7 +71,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/dataprotocol/dataprotocol.h>
+#include "dataprotocol.h"
 #include <glib/gprintf.h>       /* g_sprintf */
 #include <string.h>             /* strlen */
 #include "dp-private.h"
diff --git a/gst/gdp/dp-private.h b/gst/gdp/dp-private.h
index 174a334f57..8b5214e058 100644
--- a/gst/gdp/dp-private.h
+++ b/gst/gdp/dp-private.h
@@ -29,6 +29,8 @@
 
 G_BEGIN_DECLS
 
+/* FIXME: please make the dataprotocol format typefindable in new versions */
+
 /* accessor defines */
 #define GST_DP_HEADER_MAJOR_VERSION(x)	((x)[0])
 #define GST_DP_HEADER_MINOR_VERSION(x)  ((x)[1])
diff --git a/gst/gdp/gstgdp.c b/gst/gdp/gstgdp.c
index 31d32598b6..bfdfbc1b9c 100644
--- a/gst/gdp/gstgdp.c
+++ b/gst/gdp/gstgdp.c
@@ -21,7 +21,7 @@
 #  include <config.h>
 #endif
 
-#include <gst/dataprotocol/dataprotocol.h>
+#include "dataprotocol.h"
 
 #include "gstgdppay.h"
 #include "gstgdpdepay.h"
diff --git a/gst/gdp/gstgdpdepay.c b/gst/gdp/gstgdpdepay.c
index 6d17ab3d7b..f397a3fe43 100644
--- a/gst/gdp/gstgdpdepay.c
+++ b/gst/gdp/gstgdpdepay.c
@@ -38,7 +38,7 @@
 
 #include <string.h>
 
-#include <gst/dataprotocol/dataprotocol.h>
+#include "dataprotocol.h"
 
 #include "gstgdpdepay.h"
 
diff --git a/gst/gdp/gstgdppay.c b/gst/gdp/gstgdppay.c
index b9c3cbc787..5cc59d620a 100644
--- a/gst/gdp/gstgdppay.c
+++ b/gst/gdp/gstgdppay.c
@@ -36,7 +36,7 @@
 #include "config.h"
 #endif
 
-#include <gst/dataprotocol/dataprotocol.h>
+#include "dataprotocol.h"
 
 #include "gstgdppay.h"
 
diff --git a/tests/check/elements/gdpdepay.c b/tests/check/elements/gdpdepay.c
index 927cfbd147..61300374c9 100644
--- a/tests/check/elements/gdpdepay.c
+++ b/tests/check/elements/gdpdepay.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include <gst/check/gstcheck.h>
-#include <gst/dataprotocol/dataprotocol.h>
+#include "../../gst/gdp/dataprotocol.c"
 
 /* For ease of programming we use globals to keep refs for our floating
  * src and sink pads we create; otherwise we always have to do get_pad,
diff --git a/tests/check/elements/gdppay.c b/tests/check/elements/gdppay.c
index 4c6ccf07fa..737566cbea 100644
--- a/tests/check/elements/gdppay.c
+++ b/tests/check/elements/gdppay.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include <gst/check/gstcheck.h>
-#include <gst/dataprotocol/dataprotocol.h>
+#include "../../gst/gdp/dataprotocol.c"
 
 /* For ease of programming we use globals to keep refs for our floating
  * src and sink pads we create; otherwise we always have to do get_pad,