diff options
Diffstat (limited to 'gvc-mixer-stream.c')
| -rw-r--r-- | gvc-mixer-stream.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gvc-mixer-stream.c b/gvc-mixer-stream.c index 076b505..5de71d1 100644 --- a/gvc-mixer-stream.c +++ b/gvc-mixer-stream.c @@ -33,8 +33,6 @@ #include "gvc-mixer-stream-private.h" #include "gvc-channel-map-private.h" -#define GVC_MIXER_STREAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_STREAM, GvcMixerStreamPrivate)) - static guint32 stream_serial = 1; struct GvcMixerStreamPrivate @@ -86,7 +84,7 @@ enum static void gvc_mixer_stream_finalize (GObject *object); -G_DEFINE_ABSTRACT_TYPE (GvcMixerStream, gvc_mixer_stream, G_TYPE_OBJECT) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GvcMixerStream, gvc_mixer_stream, G_TYPE_OBJECT) static void free_port (GvcMixerStreamPort *p) @@ -993,13 +991,12 @@ gvc_mixer_stream_class_init (GvcMixerStreamClass *klass) "The index of the card for this stream", PA_INVALID_INDEX, G_MAXLONG, PA_INVALID_INDEX, G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); - g_type_class_add_private (klass, sizeof (GvcMixerStreamPrivate)); } static void gvc_mixer_stream_init (GvcMixerStream *stream) { - stream->priv = GVC_MIXER_STREAM_GET_PRIVATE (stream); + stream->priv = gvc_mixer_stream_get_instance_private (stream); } static void |