From 13a4a9a5c2badae9d18b9b437573be5c65b772d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= Date: Sat, 8 Sep 2018 23:54:47 +0300 Subject: avoid deprecated g_type_class_add_private --- gvc-channel-map.c | 8 ++------ gvc-mixer-card.c | 8 ++------ gvc-mixer-control.c | 7 ++----- gvc-mixer-event-role.c | 8 ++------ gvc-mixer-sink-input.c | 8 ++------ gvc-mixer-sink.c | 8 ++------ gvc-mixer-source-output.c | 8 ++------ gvc-mixer-source.c | 8 ++------ gvc-mixer-stream.c | 7 ++----- gvc-mixer-ui-device.c | 8 ++------ 10 files changed, 20 insertions(+), 58 deletions(-) diff --git a/gvc-channel-map.c b/gvc-channel-map.c index b37fe17..bf4d737 100644 --- a/gvc-channel-map.c +++ b/gvc-channel-map.c @@ -32,8 +32,6 @@ #include "gvc-channel-map.h" #include "gvc-channel-map-private.h" -#define GVC_CHANNEL_MAP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_CHANNEL_MAP, GvcChannelMapPrivate)) - struct GvcChannelMapPrivate { pa_channel_map pa_map; @@ -53,7 +51,7 @@ static guint signals [LAST_SIGNAL] = { 0, }; static void gvc_channel_map_finalize (GObject *object); -G_DEFINE_TYPE (GvcChannelMap, gvc_channel_map, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (GvcChannelMap, gvc_channel_map, G_TYPE_OBJECT) guint gvc_channel_map_get_num_channels (const GvcChannelMap *map) @@ -171,8 +169,6 @@ gvc_channel_map_class_init (GvcChannelMapClass *klass) NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - - g_type_class_add_private (klass, sizeof (GvcChannelMapPrivate)); } void @@ -199,7 +195,7 @@ gvc_channel_map_volume_changed (GvcChannelMap *map, static void gvc_channel_map_init (GvcChannelMap *map) { - map->priv = GVC_CHANNEL_MAP_GET_PRIVATE (map); + map->priv = gvc_channel_map_get_instance_private (map); map->priv->pa_volume_is_set = FALSE; } diff --git a/gvc-mixer-card.c b/gvc-mixer-card.c index b2e1614..ba31ab2 100644 --- a/gvc-mixer-card.c +++ b/gvc-mixer-card.c @@ -34,8 +34,6 @@ #include "gvc-mixer-card.h" #include "gvc-mixer-card-private.h" -#define GVC_MIXER_CARD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_CARD, GvcMixerCardPrivate)) - static guint32 card_serial = 1; struct GvcMixerCardPrivate @@ -67,7 +65,7 @@ enum static void gvc_mixer_card_finalize (GObject *object); -G_DEFINE_TYPE (GvcMixerCard, gvc_mixer_card, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerCard, gvc_mixer_card, G_TYPE_OBJECT) static guint32 get_next_card_serial (void) @@ -509,14 +507,12 @@ gvc_mixer_card_class_init (GvcMixerCardClass *klass) "Name of current profile for this card in human readable form", NULL, G_PARAM_READABLE)); - - g_type_class_add_private (klass, sizeof (GvcMixerCardPrivate)); } static void gvc_mixer_card_init (GvcMixerCard *card) { - card->priv = GVC_MIXER_CARD_GET_PRIVATE (card); + card->priv = gvc_mixer_card_get_instance_private (card); } GvcMixerCard * diff --git a/gvc-mixer-control.c b/gvc-mixer-control.c index 24daff8..78d5cf2 100644 --- a/gvc-mixer-control.c +++ b/gvc-mixer-control.c @@ -50,8 +50,6 @@ #include "gvc-mixer-control-private.h" #include "gvc-mixer-ui-device.h" -#define GVC_MIXER_CONTROL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_CONTROL, GvcMixerControlPrivate)) - #define RECONNECT_DELAY 5 enum { @@ -134,7 +132,7 @@ static guint signals [LAST_SIGNAL] = { 0, }; static void gvc_mixer_control_finalize (GObject *object); -G_DEFINE_TYPE (GvcMixerControl, gvc_mixer_control, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerControl, gvc_mixer_control, G_TYPE_OBJECT) pa_context * gvc_mixer_control_get_pa_context (GvcMixerControl *control) @@ -3671,14 +3669,13 @@ gvc_mixer_control_class_init (GvcMixerControlClass *klass) NULL, NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); - g_type_class_add_private (klass, sizeof (GvcMixerControlPrivate)); } static void gvc_mixer_control_init (GvcMixerControl *control) { - control->priv = GVC_MIXER_CONTROL_GET_PRIVATE (control); + control->priv = gvc_mixer_control_get_instance_private (control); control->priv->pa_mainloop = pa_glib_mainloop_new (g_main_context_default ()); g_assert (control->priv->pa_mainloop); diff --git a/gvc-mixer-event-role.c b/gvc-mixer-event-role.c index 35e8c9c..9f5e26a 100644 --- a/gvc-mixer-event-role.c +++ b/gvc-mixer-event-role.c @@ -34,8 +34,6 @@ #include "gvc-mixer-stream-private.h" #include "gvc-channel-map-private.h" -#define GVC_MIXER_EVENT_ROLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_EVENT_ROLE, GvcMixerEventRolePrivate)) - struct GvcMixerEventRolePrivate { char *device; @@ -49,7 +47,7 @@ enum static void gvc_mixer_event_role_finalize (GObject *object); -G_DEFINE_TYPE (GvcMixerEventRole, gvc_mixer_event_role, GVC_TYPE_MIXER_STREAM) +G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerEventRole, gvc_mixer_event_role, GVC_TYPE_MIXER_STREAM) static gboolean update_settings (GvcMixerEventRole *role, @@ -178,14 +176,12 @@ gvc_mixer_event_role_class_init (GvcMixerEventRoleClass *klass) "Device", NULL, G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); - - g_type_class_add_private (klass, sizeof (GvcMixerEventRolePrivate)); } static void gvc_mixer_event_role_init (GvcMixerEventRole *event_role) { - event_role->priv = GVC_MIXER_EVENT_ROLE_GET_PRIVATE (event_role); + event_role->priv = gvc_mixer_event_role_get_instance_private (event_role); } diff --git a/gvc-mixer-sink-input.c b/gvc-mixer-sink-input.c index a9bf176..a359daf 100644 --- a/gvc-mixer-sink-input.c +++ b/gvc-mixer-sink-input.c @@ -33,8 +33,6 @@ #include "gvc-mixer-stream-private.h" #include "gvc-channel-map-private.h" -#define GVC_MIXER_SINK_INPUT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_SINK_INPUT, GvcMixerSinkInputPrivate)) - struct GvcMixerSinkInputPrivate { gpointer dummy; @@ -42,7 +40,7 @@ struct GvcMixerSinkInputPrivate static void gvc_mixer_sink_input_finalize (GObject *object); -G_DEFINE_TYPE (GvcMixerSinkInput, gvc_mixer_sink_input, GVC_TYPE_MIXER_STREAM) +G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerSinkInput, gvc_mixer_sink_input, GVC_TYPE_MIXER_STREAM) static gboolean gvc_mixer_sink_input_push_volume (GvcMixerStream *stream, gpointer *op) @@ -114,14 +112,12 @@ gvc_mixer_sink_input_class_init (GvcMixerSinkInputClass *klass) stream_class->push_volume = gvc_mixer_sink_input_push_volume; stream_class->change_is_muted = gvc_mixer_sink_input_change_is_muted; - - g_type_class_add_private (klass, sizeof (GvcMixerSinkInputPrivate)); } static void gvc_mixer_sink_input_init (GvcMixerSinkInput *sink_input) { - sink_input->priv = GVC_MIXER_SINK_INPUT_GET_PRIVATE (sink_input); + sink_input->priv = gvc_mixer_sink_input_get_instance_private (sink_input); } static void diff --git a/gvc-mixer-sink.c b/gvc-mixer-sink.c index 35c2c7f..a6115c6 100644 --- a/gvc-mixer-sink.c +++ b/gvc-mixer-sink.c @@ -33,8 +33,6 @@ #include "gvc-mixer-stream-private.h" #include "gvc-channel-map-private.h" -#define GVC_MIXER_SINK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_SINK, GvcMixerSinkPrivate)) - struct GvcMixerSinkPrivate { gpointer dummy; @@ -42,7 +40,7 @@ struct GvcMixerSinkPrivate static void gvc_mixer_sink_finalize (GObject *object); -G_DEFINE_TYPE (GvcMixerSink, gvc_mixer_sink, GVC_TYPE_MIXER_STREAM) +G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerSink, gvc_mixer_sink, GVC_TYPE_MIXER_STREAM) static gboolean gvc_mixer_sink_push_volume (GvcMixerStream *stream, gpointer *op) @@ -143,14 +141,12 @@ gvc_mixer_sink_class_init (GvcMixerSinkClass *klass) stream_class->push_volume = gvc_mixer_sink_push_volume; stream_class->change_port = gvc_mixer_sink_change_port; stream_class->change_is_muted = gvc_mixer_sink_change_is_muted; - - g_type_class_add_private (klass, sizeof (GvcMixerSinkPrivate)); } static void gvc_mixer_sink_init (GvcMixerSink *sink) { - sink->priv = GVC_MIXER_SINK_GET_PRIVATE (sink); + sink->priv = gvc_mixer_sink_get_instance_private (sink); } static void diff --git a/gvc-mixer-source-output.c b/gvc-mixer-source-output.c index 664bb94..c4a275a 100644 --- a/gvc-mixer-source-output.c +++ b/gvc-mixer-source-output.c @@ -33,8 +33,6 @@ #include "gvc-mixer-stream-private.h" #include "gvc-channel-map-private.h" -#define GVC_MIXER_SOURCE_OUTPUT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_SOURCE_OUTPUT, GvcMixerSourceOutputPrivate)) - struct GvcMixerSourceOutputPrivate { gpointer dummy; @@ -42,7 +40,7 @@ struct GvcMixerSourceOutputPrivate static void gvc_mixer_source_output_finalize (GObject *object); -G_DEFINE_TYPE (GvcMixerSourceOutput, gvc_mixer_source_output, GVC_TYPE_MIXER_STREAM) +G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerSourceOutput, gvc_mixer_source_output, GVC_TYPE_MIXER_STREAM) static gboolean gvc_mixer_source_output_push_volume (GvcMixerStream *stream, gpointer *op) @@ -114,14 +112,12 @@ gvc_mixer_source_output_class_init (GvcMixerSourceOutputClass *klass) stream_class->push_volume = gvc_mixer_source_output_push_volume; stream_class->change_is_muted = gvc_mixer_source_output_change_is_muted; - - g_type_class_add_private (klass, sizeof (GvcMixerSourceOutputPrivate)); } static void gvc_mixer_source_output_init (GvcMixerSourceOutput *source_output) { - source_output->priv = GVC_MIXER_SOURCE_OUTPUT_GET_PRIVATE (source_output); + source_output->priv = gvc_mixer_source_output_get_instance_private (source_output); } diff --git a/gvc-mixer-source.c b/gvc-mixer-source.c index 051b795..434eec3 100644 --- a/gvc-mixer-source.c +++ b/gvc-mixer-source.c @@ -33,8 +33,6 @@ #include "gvc-mixer-stream-private.h" #include "gvc-channel-map-private.h" -#define GVC_MIXER_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_SOURCE, GvcMixerSourcePrivate)) - struct GvcMixerSourcePrivate { gpointer dummy; @@ -42,7 +40,7 @@ struct GvcMixerSourcePrivate static void gvc_mixer_source_finalize (GObject *object); -G_DEFINE_TYPE (GvcMixerSource, gvc_mixer_source, GVC_TYPE_MIXER_STREAM) +G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerSource, gvc_mixer_source, GVC_TYPE_MIXER_STREAM) static gboolean gvc_mixer_source_push_volume (GvcMixerStream *stream, gpointer *op) @@ -143,14 +141,12 @@ gvc_mixer_source_class_init (GvcMixerSourceClass *klass) stream_class->push_volume = gvc_mixer_source_push_volume; stream_class->change_is_muted = gvc_mixer_source_change_is_muted; stream_class->change_port = gvc_mixer_source_change_port; - - g_type_class_add_private (klass, sizeof (GvcMixerSourcePrivate)); } static void gvc_mixer_source_init (GvcMixerSource *source) { - source->priv = GVC_MIXER_SOURCE_GET_PRIVATE (source); + source->priv = gvc_mixer_source_get_instance_private (source); } static void 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 diff --git a/gvc-mixer-ui-device.c b/gvc-mixer-ui-device.c index 285a0c0..a22afc2 100644 --- a/gvc-mixer-ui-device.c +++ b/gvc-mixer-ui-device.c @@ -23,8 +23,6 @@ #include "gvc-mixer-ui-device.h" #include "gvc-mixer-card.h" -#define GVC_MIXER_UI_DEVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GVC_TYPE_MIXER_UI_DEVICE, GvcMixerUIDevicePrivate)) - struct GvcMixerUIDevicePrivate { gchar *first_line_desc; @@ -64,7 +62,7 @@ static void gvc_mixer_ui_device_finalize (GObject *object); static void gvc_mixer_ui_device_set_icon_name (GvcMixerUIDevice *device, const char *icon_name); -G_DEFINE_TYPE (GvcMixerUIDevice, gvc_mixer_ui_device, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerUIDevice, gvc_mixer_ui_device, G_TYPE_OBJECT) static guint32 get_next_output_serial (void) @@ -192,7 +190,7 @@ gvc_mixer_ui_device_constructor (GType type, static void gvc_mixer_ui_device_init (GvcMixerUIDevice *device) { - device->priv = GVC_MIXER_UI_DEVICE_GET_PRIVATE (device); + device->priv = gvc_mixer_ui_device_get_instance_private (device); } static void @@ -290,8 +288,6 @@ gvc_mixer_ui_device_class_init (GvcMixerUIDeviceClass *klass) NULL, G_PARAM_READWRITE|G_PARAM_CONSTRUCT); g_object_class_install_property (object_class, PROP_ICON_NAME, pspec); - - g_type_class_add_private (klass, sizeof (GvcMixerUIDevicePrivate)); } /* Removes the part of the string that starts with skip_prefix -- cgit v1.2.1