From 6be9a89195e0d3bf8408cea661f22cb97b638f24 Mon Sep 17 00:00:00 2001 From: Michal Ratajsky Date: Fri, 20 Jun 2014 00:12:40 +0200 Subject: Pulse and API updates, fixes --- backends/pulse/pulse-sink-input.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'backends/pulse/pulse-sink-input.h') diff --git a/backends/pulse/pulse-sink-input.h b/backends/pulse/pulse-sink-input.h index 110ca9c..a498999 100644 --- a/backends/pulse/pulse-sink-input.h +++ b/backends/pulse/pulse-sink-input.h @@ -21,11 +21,11 @@ #include #include -#include - #include #include "pulse-client-stream.h" +#include "pulse-connection.h" +#include "pulse-stream.h" G_BEGIN_DECLS @@ -38,33 +38,32 @@ G_BEGIN_DECLS #define PULSE_SINK_INPUT_CLASS(k) \ (G_TYPE_CHECK_CLASS_CAST ((k), PULSE_TYPE_SINK_INPUT, PulseSinkInputClass)) #define PULSE_IS_SINK_INPUT_CLASS(k) \ - (G_TYPE_CLASS_CHECK_CLASS_TYPE ((k), PULSE_TYPE_SINK_INPUT)) + (G_TYPE_CHECK_CLASS_TYPE ((k), PULSE_TYPE_SINK_INPUT)) #define PULSE_SINK_INPUT_GET_CLASS(o) \ (G_TYPE_INSTANCE_GET_CLASS ((o), PULSE_TYPE_SINK_INPUT, PulseSinkInputClass)) -typedef struct _PulseSinkInput PulseSinkInput; -typedef struct _PulseSinkInputClass PulseSinkInputClass; -typedef struct _PulseSinkInputPrivate PulseSinkInputPrivate; +typedef struct _PulseSinkInput PulseSinkInput; +typedef struct _PulseSinkInputClass PulseSinkInputClass; struct _PulseSinkInput { PulseClientStream parent; - - PulseSinkInputPrivate *priv; }; struct _PulseSinkInputClass { - PulseClientStreamClass parent; + PulseClientStreamClass parent_class; }; GType pulse_sink_input_get_type (void) G_GNUC_CONST; PulseStream *pulse_sink_input_new (PulseConnection *connection, - const pa_sink_input_info *info); + const pa_sink_input_info *info, + PulseStream *parent); gboolean pulse_sink_input_update (PulseStream *stream, - const pa_sink_input_info *info); + const pa_sink_input_info *info, + PulseStream *parent); G_END_DECLS -- cgit v1.2.1