[libdmapsharing] Move some things around so that the library is useful without GStreamer; needs more work Signed-off-

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

commit f43648f8084df166df85e048c17879288e7c92bf
Author: W. Michael Petullo <mike flyn org>
Date:   Thu Jan 27 22:50:01 2011 -0600

    Move some things around so that the library is useful without GStreamer; needs more work
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/dmap-gst-input-stream.h     |    3 ++-
 libdmapsharing/dmap-gst-mp3-input-stream.c |    4 ++++
 libdmapsharing/dmap-gst-wav-input-stream.c |    4 ++++
 libdmapsharing/gst-util.c                  |    1 +
 4 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/libdmapsharing/dmap-gst-input-stream.h b/libdmapsharing/dmap-gst-input-stream.h
index ab91d29..3493d19 100644
--- a/libdmapsharing/dmap-gst-input-stream.h
+++ b/libdmapsharing/dmap-gst-input-stream.h
@@ -25,7 +25,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-#include <gst/gst.h>
 
 G_BEGIN_DECLS
 
@@ -69,8 +68,10 @@ enum {
 
 GInputStream* dmap_gst_input_stream_new (const gchar *transcode_mimetype, GInputStream *src_stream);
 
+/* FIXME: this prototype was moved to the specific implementations in order to make this header file work without GStreamer installed:
 void dmap_gst_input_stream_new_buffer_cb		 (GstElement *element,
 						  DMAPGstInputStream *stream);
+						  */
 
 gchar *dmapd_input_stream_strdup_format_extension (const gint format_code);
 
diff --git a/libdmapsharing/dmap-gst-mp3-input-stream.c b/libdmapsharing/dmap-gst-mp3-input-stream.c
index 6c0341b..9c31a3c 100644
--- a/libdmapsharing/dmap-gst-mp3-input-stream.c
+++ b/libdmapsharing/dmap-gst-mp3-input-stream.c
@@ -37,6 +37,10 @@ struct DMAPGstMP3InputStreamPrivate {
 	GstElement *sink;
 };
 
+/* FIXME: See note in dmap-gst-input-stream.h */
+void dmap_gst_input_stream_new_buffer_cb		 (GstElement *element,
+						  DMAPGstInputStream *stream);
+
 static void
 new_decoded_pad_cb (GstElement *element,
 		    GstPad *pad,
diff --git a/libdmapsharing/dmap-gst-wav-input-stream.c b/libdmapsharing/dmap-gst-wav-input-stream.c
index feec585..84e876c 100644
--- a/libdmapsharing/dmap-gst-wav-input-stream.c
+++ b/libdmapsharing/dmap-gst-wav-input-stream.c
@@ -38,6 +38,10 @@ struct DMAPGstWAVInputStreamPrivate {
 	GstElement *sink;
 };
 
+/* FIXME: See note in dmap-gst-input-stream.h */
+void dmap_gst_input_stream_new_buffer_cb		 (GstElement *element,
+						  DMAPGstInputStream *stream);
+
 static void
 new_decoded_pad_cb (GstElement *element,
 		    GstPad *pad,
diff --git a/libdmapsharing/gst-util.c b/libdmapsharing/gst-util.c
index b0efab1..a62db06 100644
--- a/libdmapsharing/gst-util.c
+++ b/libdmapsharing/gst-util.c
@@ -19,6 +19,7 @@
  */
 
 #include <string.h>
+#include <gst/gst.h>
 
 #include "dmap-gst-input-stream.h"