[libdmapsharing] Continue DMAPGst.* related work Signed-off-by: W. Michael Petullo <mike flyn org>

[W. Michael Petullo <wmpetullo src gnome org>]

commit 6fd86ceb6c359770f7b348e281b0d2e2dcc516b1
Author: W. Michael Petullo <mike flyn org>
Date:   Thu Dec 23 12:21:26 2010 -0600

    Continue DMAPGst.* related work
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing.pc.in                   |    2 +-
 libdmapsharing/dmap-gst-input-stream.c |    4 ++++
 libdmapsharing/dmap-gst-input-stream.h |    4 +---
 tests/Makefile.am                      |    3 +++
 vala/Makefile.am                       |    2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/libdmapsharing.pc.in b/libdmapsharing.pc.in
index c46f912..59b0807 100644
--- a/libdmapsharing.pc.in
+++ b/libdmapsharing.pc.in
@@ -6,6 +6,6 @@ includedir= includedir@
 Name: libdmapsharing
 Description: libdmapsharing
 Version: @VERSION@
-Requires: glib-2.0 libsoup-2.4
+Requires: glib-2.0 libsoup-2.4 gstreamer-0.10
 Libs: -L${libdir} -ldmapsharing- API_VERSION@
 Cflags: -I${includedir}/libdmapsharing- API_VERSION@
diff --git a/libdmapsharing/dmap-gst-input-stream.c b/libdmapsharing/dmap-gst-input-stream.c
index 84ae663..a2438a6 100644
--- a/libdmapsharing/dmap-gst-input-stream.c
+++ b/libdmapsharing/dmap-gst-input-stream.c
@@ -59,6 +59,10 @@ struct DMAPGstInputStreamPrivate {
 	gboolean buffer_closed;		/* May close before decoding complete */
 };
 
+#define DMAP_GST_INPUT_STREAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+					   DMAP_TYPE_GST_INPUT_STREAM, \
+					   DMAPGstInputStreamPrivate))
+
 static goffset
 dmap_gst_input_stream_tell (GSeekable *seekable)
 {
diff --git a/libdmapsharing/dmap-gst-input-stream.h b/libdmapsharing/dmap-gst-input-stream.h
index 2303485..ab91d29 100644
--- a/libdmapsharing/dmap-gst-input-stream.h
+++ b/libdmapsharing/dmap-gst-input-stream.h
@@ -23,6 +23,7 @@
 #ifndef __DMAP_GST_INPUT_STREAM
 #define __DMAP_GST_INPUT_STREAM
 
+#include <glib-object.h>
 #include <gio/gio.h>
 #include <gst/gst.h>
 
@@ -42,9 +43,6 @@ G_BEGIN_DECLS
 #define DMAP_GST_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
 				               DMAP_TYPE_GST_INPUT_STREAM, \
 					       DMAPGstInputStreamClass))
-#define DMAP_GST_INPUT_STREAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-					   DMAP_TYPE_GST_INPUT_STREAM, \
-					   DMAPGstInputStreamPrivate))
 
 typedef struct DMAPGstInputStreamPrivate DMAPGstInputStreamPrivate;
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c56980e..d7db163 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,6 +16,7 @@ test_dmap_client_LDADD = \
 	$(top_builddir)/libdmapsharing/libdmapsharing-3.0.la \
 	$(GLIB_LIBS) \
 	$(GTHREAD_LIBS) \
+	$(GSTREAMERAPP_LIBS) \
 	$(GOBJECT_LIBS) \
 	$(GDKPIXBUF_LIBS) \
 	$(SOUP_LIBS) \
@@ -36,6 +37,7 @@ test_dmap_server_LDADD = \
 	$(top_builddir)/libdmapsharing/libdmapsharing-3.0.la \
 	$(GLIB_LIBS) \
 	$(GTHREAD_LIBS) \
+	$(GSTREAMERAPP_LIBS) \
 	$(GOBJECT_LIBS) \
 	$(GDKPIXBUF_LIBS) \
 	$(SOUP_LIBS) \
@@ -108,6 +110,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(GLIB_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
+	$(GSTREAMERAPP_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
 	$(GDKPIXBUF_CFLAGS) \
 	$(SOUP_CFLAGS) \
diff --git a/vala/Makefile.am b/vala/Makefile.am
index ee5c2b3..36e301a 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -12,7 +12,7 @@ libdmapsharing- API_VERSION@-dpap/libdmapsharing- API_VERSION@.gi: libdmapsharin
 	PKG_CONFIG_PATH=$(top_builddir):${PKG_CONFIG_PATH} $(VALA_GEN_INTROSPECT) libdmapsharing- API_VERSION@ libdmapsharing- API_VERSION@-dpap
 
 libdmapsharing- API_VERSION@-daap.vapi: libdmapsharing- API_VERSION@-daap/libdmapsharing- API_VERSION@.gi libdmapsharing- API_VERSION@-daap/libdmapsharing- API_VERSION@.metadata
-	$(VAPIGEN) --pkg=libsoup-2.4 --pkg=glib-2.0 --library libdmapsharing- API_VERSION@-daap libdmapsharing- API_VERSION@-daap/libdmapsharing- API_VERSION@.gi
+	$(VAPIGEN) --pkg=libsoup-2.4 --pkg=glib-2.0 --pkg=gio-2.0 --pkg=gstreamer-0.10 --library libdmapsharing- API_VERSION@-daap libdmapsharing- API_VERSION@-daap/libdmapsharing- API_VERSION@.gi
 
 libdmapsharing- API_VERSION@-dacp.vapi: libdmapsharing- API_VERSION@-dacp/libdmapsharing- API_VERSION@.gi libdmapsharing- API_VERSION@-dacp/libdmapsharing- API_VERSION@.metadata
 	$(VAPIGEN) --pkg=libsoup-2.4 --pkg=glib-2.0 --library libdmapsharing- API_VERSION@-dacp libdmapsharing- API_VERSION@-dacp/libdmapsharing- API_VERSION@.gi