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.

android/gdp.mk

@@ -17,8 +17,7 @@ LOCAL_SHARED_LIBRARIES := \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
-    libgobject-2.0 			\
-	libgstdataprotocol-0.11
+    libgobject-2.0
 
 LOCAL_MODULE:= libgstgdp
 

configure.ac

@@ -262,7 +262,6 @@ dnl checks for gstreamer
 dnl uninstalled is selected preferentially -- see pkg-config(1)
 AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ], yes)
 AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ], yes)
-AG_GST_CHECK_GST_GDP($GST_MAJORMINOR, [$GST_REQ], yes)
 AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ], yes)
 AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
 AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")

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 \

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"

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])

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"

gst/gdp/gstgdpdepay.c

@@ -38,7 +38,7 @@
 
 #include <string.h>
 
-#include <gst/dataprotocol/dataprotocol.h>
+#include "dataprotocol.h"
 
 #include "gstgdpdepay.h"
 

gst/gdp/gstgdppay.c

@@ -36,7 +36,7 @@
 #include "config.h"
 #endif
 
-#include <gst/dataprotocol/dataprotocol.h>
+#include "dataprotocol.h"
 
 #include "gstgdppay.h"
 

tests/check/Makefile.am

@@ -357,8 +357,8 @@ elements_audiorate_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
 elements_libvisual_LDADD =  $(LDADD)
 elements_libvisual_CFLAGS = $(CFLAGS) $(AM_CFLAGS)
 
-elements_gdpdepay_LDADD = $(GST_GDP_LIBS) $(LDADD)
-elements_gdppay_LDADD = $(GST_GDP_LIBS) $(LDADD)
+elements_gdpdepay_LDADD = $(LDADD)
+elements_gdppay_LDADD = $(LDADD)
 
 elements_playbin_LDADD = $(GST_BASE_LIBS) $(LDADD)
 elements_playbin_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)

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,

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,