Commit 6fd86ceb authored by W. Michael Petullo's avatar W. Michael Petullo
Browse files

Continue DMAPGst.* related work


Signed-off-by: W. Michael Petullo's avatarW. Michael Petullo <mike@flyn.org>
parent c3adf7ce
......@@ -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@
......@@ -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)
{
......
......@@ -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;
......
......@@ -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) \
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment