GNOME.org
 

[libdmapsharing] Replace use of deprecated G_TYPE_INSTANCE_GET_PRIVATE

commit 816e0a1236306d8d33e3ec7cf44adce357cb744b
Author: W. Michael Petullo <mike flyn org>
Date:   Thu May 7 22:52:27 2020 -0500

    Replace use of deprecated G_TYPE_INSTANCE_GET_PRIVATE
    
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/dmap-av-connection.c        |  2 --
 libdmapsharing/dmap-connection.c           | 19 ++++++++-----------
 libdmapsharing/dmap-control-connection.c   |  8 +++-----
 libdmapsharing/dmap-control-share.c        | 11 +++--------
 libdmapsharing/dmap-gst-input-stream.c     |  6 ------
 libdmapsharing/dmap-gst-mp3-input-stream.c | 10 ++++------
 libdmapsharing/dmap-gst-mp3-input-stream.h |  3 ---
 libdmapsharing/dmap-gst-qt-input-stream.c  | 10 ++++------
 libdmapsharing/dmap-gst-qt-input-stream.h  |  3 ---
 libdmapsharing/dmap-gst-wav-input-stream.c | 10 ++++------
 libdmapsharing/dmap-gst-wav-input-stream.h |  3 ---
 libdmapsharing/dmap-image-connection.c     |  2 --
 libdmapsharing/dmap-image-share.c          | 11 ++++-------
 libdmapsharing/dmap-mdns-browser-avahi.c   | 12 +++++-------
 libdmapsharing/dmap-mdns-browser-dnssd.c   | 11 ++++-------
 libdmapsharing/dmap-mdns-browser-howl.c    | 12 +++++-------
 libdmapsharing/dmap-mdns-publisher-avahi.c | 12 ++++--------
 libdmapsharing/dmap-mdns-publisher-dnssd.c | 11 ++++-------
 libdmapsharing/dmap-mdns-service.c         | 11 ++++-------
 libdmapsharing/dmap-share.c                | 17 ++++-------------
 libdmapsharing/test-dmap-av-record.c       | 12 ++++++------
 libdmapsharing/test-dmap-av-record.h       |  3 ---
 libdmapsharing/test-dmap-db.c              | 25 +++++++++++++------------
 libdmapsharing/test-dmap-db.h              |  3 ---
 libdmapsharing/test-dmap-image-record.c    | 14 ++++++--------
 libdmapsharing/test-dmap-image-record.h    |  3 ---
 26 files changed, 85 insertions(+), 159 deletions(-)
---
diff --git a/libdmapsharing/dmap-av-connection.c b/libdmapsharing/dmap-av-connection.c
index 07a9d98..6a71c28 100644
--- a/libdmapsharing/dmap-av-connection.c
+++ b/libdmapsharing/dmap-av-connection.c
@@ -24,8 +24,6 @@
 #include <libdmapsharing/dmap-structure.h>
 #include <libdmapsharing/test-dmap-db.h>
 
-#define DMAP_AV_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_AV_CONNECTION, 
DmapAvConnectionPrivate))
-
 static DmapContentCode
 _get_protocol_version_cc (G_GNUC_UNUSED DmapConnection * connection)
 {
diff --git a/libdmapsharing/dmap-connection.c b/libdmapsharing/dmap-connection.c
index 8eb5c25..4a93bc5 100644
--- a/libdmapsharing/dmap-connection.c
+++ b/libdmapsharing/dmap-connection.c
@@ -84,12 +84,15 @@ struct DmapConnectionPrivate
        char *last_error_message;
 };
 
-G_DEFINE_TYPE_WITH_CODE (DmapConnection,
-                         dmap_connection,
-                         G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (DmapConnection));
+G_DEFINE_TYPE_WITH_PRIVATE (DmapConnection,
+                            dmap_connection,
+                            G_TYPE_OBJECT);
 
-#define DMAP_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_CONNECTION, 
DmapConnectionPrivate))
+static void
+dmap_connection_init (DmapConnection * connection)
+{
+       connection->priv = dmap_connection_get_instance_private(connection);
+}
 
 enum
 {
@@ -481,12 +484,6 @@ dmap_connection_class_init (DmapConnectionClass * klass)
                              G_TYPE_POINTER);
 }
 
-static void
-dmap_connection_init (DmapConnection * connection)
-{
-       connection->priv = DMAP_CONNECTION_GET_PRIVATE (connection);
-}
-
 static void
 _connection_connected (DmapConnection * connection)
 {
diff --git a/libdmapsharing/dmap-control-connection.c b/libdmapsharing/dmap-control-connection.c
index f01ae24..969e32b 100644
--- a/libdmapsharing/dmap-control-connection.c
+++ b/libdmapsharing/dmap-control-connection.c
@@ -23,8 +23,6 @@
 #include <libdmapsharing/dmap-control-connection.h>
 #include <libdmapsharing/dmap-structure.h>
 
-#define DMAP_CONTROL_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DACP_TYPE_CONNECTION, 
DmapControlConnectionPrivate))
-
 static DmapContentCode
 _get_protocol_version_cc (G_GNUC_UNUSED DmapConnection * connection)
 {
@@ -81,10 +79,10 @@ dmap_control_connection_new (const char *name,
        return connection;
 }
 
+G_DEFINE_TYPE (DmapControlConnection, dmap_control_connection, DMAP_TYPE_CONNECTION);
+
 static void
 dmap_control_connection_init (DmapControlConnection * connection)
 {
-        connection->priv = DMAP_CONTROL_CONNECTION_GET_PRIVATE (connection);
+       connection->priv = dmap_control_connection_get_instance_private(connection);
 }
-
-G_DEFINE_TYPE (DmapControlConnection, dmap_control_connection, DMAP_TYPE_CONNECTION);
diff --git a/libdmapsharing/dmap-control-share.c b/libdmapsharing/dmap-control-share.c
index 931c98e..bd1d6c7 100644
--- a/libdmapsharing/dmap-control-share.c
+++ b/libdmapsharing/dmap-control-share.c
@@ -85,8 +85,6 @@ typedef struct {
        DmapConnection *connection;
 } DACPRemoteInfo;
 
-#define DMAP_CONTROL_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_CONTROL_SHARE, 
DmapControlSharePrivate))
-
 enum {
        PROP_0,
        PROP_LIBRARY_NAME,
@@ -106,10 +104,9 @@ enum {
 
 static guint _signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE_WITH_CODE (DmapControlShare,
-                         dmap_control_share,
-                         DMAP_TYPE_SHARE,
-                         G_ADD_PRIVATE (DmapControlShare));
+G_DEFINE_TYPE_WITH_PRIVATE (DmapControlShare,
+                            dmap_control_share,
+                            DMAP_TYPE_SHARE);
 
 static gchar *
 _get_dbid (void)
@@ -372,8 +369,6 @@ dmap_control_share_class_init (DmapControlShareClass * klass)
 static void
 dmap_control_share_init (DmapControlShare * share)
 {
-       share->priv = DMAP_CONTROL_SHARE_GET_PRIVATE (share);
-
        share->priv->current_revision = 2;
 
        share->priv->remotes = g_hash_table_new_full ((GHashFunc) g_str_hash,
diff --git a/libdmapsharing/dmap-gst-input-stream.c b/libdmapsharing/dmap-gst-input-stream.c
index df4e34d..be36634 100644
--- a/libdmapsharing/dmap-gst-input-stream.c
+++ b/libdmapsharing/dmap-gst-input-stream.c
@@ -47,10 +47,6 @@ 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
 _tell (G_GNUC_UNUSED GSeekable * seekable)
 {
@@ -445,8 +441,6 @@ dmap_gst_input_stream_class_init (DmapGstInputStreamClass * klass)
 static void
 dmap_gst_input_stream_init (DmapGstInputStream * stream)
 {
-       stream->priv = DMAP_GST_INPUT_STREAM_GET_PRIVATE (stream);
-
        stream->priv->buffer = g_queue_new ();
        stream->priv->read_request = 0;
        stream->priv->write_request = 0;
diff --git a/libdmapsharing/dmap-gst-mp3-input-stream.c b/libdmapsharing/dmap-gst-mp3-input-stream.c
index 000028f..1550172 100644
--- a/libdmapsharing/dmap-gst-mp3-input-stream.c
+++ b/libdmapsharing/dmap-gst-mp3-input-stream.c
@@ -204,10 +204,9 @@ _kill_pipeline (DmapGstInputStream * stream)
        gst_object_unref (GST_OBJECT (mp3_stream->priv->pipeline));
 }
 
-G_DEFINE_TYPE_WITH_CODE (DmapGstMP3InputStream,
-                         dmap_gst_mp3_input_stream,
-                        DMAP_TYPE_GST_INPUT_STREAM,
-                         G_ADD_PRIVATE (DmapGstMP3InputStream));
+G_DEFINE_TYPE_WITH_PRIVATE (DmapGstMP3InputStream,
+                            dmap_gst_mp3_input_stream,
+                           DMAP_TYPE_GST_INPUT_STREAM);
 
 static void
 dmap_gst_mp3_input_stream_class_init (DmapGstMP3InputStreamClass * klass)
@@ -221,6 +220,5 @@ dmap_gst_mp3_input_stream_class_init (DmapGstMP3InputStreamClass * klass)
 static void
 dmap_gst_mp3_input_stream_init (DmapGstMP3InputStream * stream)
 {
-       stream->priv = DMAP_GST_MP3_INPUT_STREAM_GET_PRIVATE (stream);
-
+       stream->priv = dmap_gst_mp3_input_stream_get_instance_private(stream);
 }
diff --git a/libdmapsharing/dmap-gst-mp3-input-stream.h b/libdmapsharing/dmap-gst-mp3-input-stream.h
index 223caa9..ac95dfe 100644
--- a/libdmapsharing/dmap-gst-mp3-input-stream.h
+++ b/libdmapsharing/dmap-gst-mp3-input-stream.h
@@ -42,9 +42,6 @@ G_BEGIN_DECLS
 #define DMAP_GST_MP3_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
                                               DMAP_TYPE_GST_MP3_INPUT_STREAM, \
                                               DmapGstMP3InputStreamClass))
-#define DMAP_GST_MP3_INPUT_STREAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-                                          DMAP_TYPE_GST_MP3_INPUT_STREAM, \
-                                          DmapGstMP3InputStreamPrivate))
 typedef struct DmapGstMP3InputStreamPrivate DmapGstMP3InputStreamPrivate;
 
 typedef struct {
diff --git a/libdmapsharing/dmap-gst-qt-input-stream.c b/libdmapsharing/dmap-gst-qt-input-stream.c
index c714593..1850375 100644
--- a/libdmapsharing/dmap-gst-qt-input-stream.c
+++ b/libdmapsharing/dmap-gst-qt-input-stream.c
@@ -215,10 +215,9 @@ _kill_pipeline (DmapGstInputStream * stream)
        gst_object_unref (GST_OBJECT (qt_stream->priv->pipeline));
 }
 
-G_DEFINE_TYPE_WITH_CODE (DmapGstQtInputStream,
-                         dmap_gst_qt_input_stream,
-                         DMAP_TYPE_GST_INPUT_STREAM,
-                         G_ADD_PRIVATE (DmapGstQtInputStream));
+G_DEFINE_TYPE_WITH_PRIVATE (DmapGstQtInputStream,
+                            dmap_gst_qt_input_stream,
+                            DMAP_TYPE_GST_INPUT_STREAM);
 
 static void
 dmap_gst_qt_input_stream_class_init (DmapGstQtInputStreamClass * klass)
@@ -232,6 +231,5 @@ dmap_gst_qt_input_stream_class_init (DmapGstQtInputStreamClass * klass)
 static void
 dmap_gst_qt_input_stream_init (DmapGstQtInputStream * stream)
 {
-       stream->priv = DMAP_GST_QT_INPUT_STREAM_GET_PRIVATE (stream);
-
+       stream->priv = dmap_gst_qt_input_stream_get_instance_private(stream);
 }
diff --git a/libdmapsharing/dmap-gst-qt-input-stream.h b/libdmapsharing/dmap-gst-qt-input-stream.h
index bf234a2..9f4dffa 100644
--- a/libdmapsharing/dmap-gst-qt-input-stream.h
+++ b/libdmapsharing/dmap-gst-qt-input-stream.h
@@ -42,9 +42,6 @@ G_BEGIN_DECLS
 #define DMAP_GST_QT_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
                                               DMAP_TYPE_GST_QT_INPUT_STREAM, \
                                               DmapGstQtInputStreamClass))
-#define DMAP_GST_QT_INPUT_STREAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-                                          DMAP_TYPE_GST_QT_INPUT_STREAM, \
-                                          DmapGstQtInputStreamPrivate))
 typedef struct DmapGstQtInputStreamPrivate DmapGstQtInputStreamPrivate;
 
 typedef struct {
diff --git a/libdmapsharing/dmap-gst-wav-input-stream.c b/libdmapsharing/dmap-gst-wav-input-stream.c
index 82f72f9..47f8499 100644
--- a/libdmapsharing/dmap-gst-wav-input-stream.c
+++ b/libdmapsharing/dmap-gst-wav-input-stream.c
@@ -220,10 +220,9 @@ _kill_pipeline (DmapGstInputStream * stream)
        gst_object_unref (GST_OBJECT (wav_stream->priv->pipeline));
 }
 
-G_DEFINE_TYPE_WITH_CODE (DmapGstWavInputStream,
-                         dmap_gst_wav_input_stream,
-                         DMAP_TYPE_GST_INPUT_STREAM,
-                         G_ADD_PRIVATE (DmapGstWavInputStream))
+G_DEFINE_TYPE_WITH_PRIVATE (DmapGstWavInputStream,
+                            dmap_gst_wav_input_stream,
+                            DMAP_TYPE_GST_INPUT_STREAM);
 
      static void
             dmap_gst_wav_input_stream_class_init (DmapGstWavInputStreamClass
@@ -238,6 +237,5 @@ G_DEFINE_TYPE_WITH_CODE (DmapGstWavInputStream,
 static void
 dmap_gst_wav_input_stream_init (DmapGstWavInputStream * stream)
 {
-       stream->priv = DMAP_GST_WAV_INPUT_STREAM_GET_PRIVATE (stream);
-
+       stream->priv = dmap_gst_wav_input_stream_get_instance_private(stream);
 }
diff --git a/libdmapsharing/dmap-gst-wav-input-stream.h b/libdmapsharing/dmap-gst-wav-input-stream.h
index 9f9117b..e03e77a 100644
--- a/libdmapsharing/dmap-gst-wav-input-stream.h
+++ b/libdmapsharing/dmap-gst-wav-input-stream.h
@@ -42,9 +42,6 @@ G_BEGIN_DECLS
 #define DMAP_GST_WAV_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
                                               DMAP_TYPE_GST_WAV_INPUT_STREAM, \
                                               DmapGstWavInputStreamClass))
-#define DMAP_GST_WAV_INPUT_STREAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-                                          DMAP_TYPE_GST_WAV_INPUT_STREAM, \
-                                          DmapGstWavInputStreamPrivate))
 typedef struct DmapGstWavInputStreamPrivate DmapGstWavInputStreamPrivate;
 
 typedef struct {
diff --git a/libdmapsharing/dmap-image-connection.c b/libdmapsharing/dmap-image-connection.c
index f938dfc..251ee6f 100644
--- a/libdmapsharing/dmap-image-connection.c
+++ b/libdmapsharing/dmap-image-connection.c
@@ -23,8 +23,6 @@
 #include <libdmapsharing/dmap-image-connection.h>
 #include <libdmapsharing/dmap-structure.h>
 
-#define DMAP_IMAGE_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_IMAGE_CONNECTION, 
DmapImageConnectionPrivate))
-
 static DmapContentCode
 _get_protocol_version_cc (G_GNUC_UNUSED DmapConnection * connection)
 {
diff --git a/libdmapsharing/dmap-image-share.c b/libdmapsharing/dmap-image-share.c
index 80671c5..7307168 100644
--- a/libdmapsharing/dmap-image-share.c
+++ b/libdmapsharing/dmap-image-share.c
@@ -108,12 +108,9 @@ static struct DmapMetaDataMap _meta_data_map[] = {
  */
 static GMappedFile *_mapped_file = NULL;
 
-#define DMAP_IMAGE_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_IMAGE_SHARE, 
DmapImageSharePrivate))
-
-G_DEFINE_TYPE_WITH_CODE (DmapImageShare,
-                         dmap_image_share,
-                         DMAP_TYPE_SHARE,
-                         G_ADD_PRIVATE (DmapImageShare));
+G_DEFINE_TYPE_WITH_PRIVATE (DmapImageShare,
+                            dmap_image_share,
+                            DMAP_TYPE_SHARE);
 
 static struct DmapMetaDataMap *
 _get_meta_data_map (G_GNUC_UNUSED DmapShare * share)
@@ -439,8 +436,8 @@ dmap_image_share_class_init (DmapImageShareClass * klass)
 static void
 dmap_image_share_init (DmapImageShare * share)
 {
-       share->priv = DMAP_IMAGE_SHARE_GET_PRIVATE (share);
        /* FIXME: do I need to manually call parent _init? */
+       share->priv = dmap_image_share_get_instance_private(share);
 }
 
 /* FIXME: trancode_mimetype currently not used for DPAP, only DAAP. 
diff --git a/libdmapsharing/dmap-mdns-browser-avahi.c b/libdmapsharing/dmap-mdns-browser-avahi.c
index 808d052..64fe3a1 100644
--- a/libdmapsharing/dmap-mdns-browser-avahi.c
+++ b/libdmapsharing/dmap-mdns-browser-avahi.c
@@ -102,14 +102,11 @@ static void _browse_cb (AvahiServiceBrowser * service_browser,
 #endif
                         DmapMdnsBrowser * browser);
 
-#define DMAP_MDNS_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_BROWSER, 
DmapMdnsBrowserPrivate))
-
 static guint _signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE_WITH_CODE (DmapMdnsBrowser,
-                         dmap_mdns_browser,
-                         G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (DmapMdnsBrowser));
+G_DEFINE_TYPE_WITH_PRIVATE (DmapMdnsBrowser,
+                            dmap_mdns_browser,
+                            G_TYPE_OBJECT);
 
 GQuark
 dmap_mdns_browser_error_quark (void)
@@ -154,7 +151,8 @@ dmap_mdns_browser_class_init (DmapMdnsBrowserClass * klass)
 static void
 dmap_mdns_browser_init (DmapMdnsBrowser * browser)
 {
-       browser->priv = DMAP_MDNS_BROWSER_GET_PRIVATE (browser);
+       browser->priv = dmap_mdns_browser_get_instance_private(browser);
+
        _client_init (browser);
 }
 
diff --git a/libdmapsharing/dmap-mdns-browser-dnssd.c b/libdmapsharing/dmap-mdns-browser-dnssd.c
index 64b818e..114204c 100644
--- a/libdmapsharing/dmap-mdns-browser-dnssd.c
+++ b/libdmapsharing/dmap-mdns-browser-dnssd.c
@@ -56,21 +56,18 @@ enum
        LAST_SIGNAL
 };
 
-#define DMAP_MDNS_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_BROWSER, 
DmapMdnsBrowserPrivate))
-
 static guint _signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE_WITH_CODE (DmapMdnsBrowser,
-                         dmap_mdns_browser,
-                         G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (DmapMdnsBrowser));
+G_DEFINE_TYPE_WITH_PRIVATE (DmapMdnsBrowser,
+                            dmap_mdns_browser,
+                            G_TYPE_OBJECT);
 
 static void
 dmap_mdns_browser_init (DmapMdnsBrowser * browser)
 {
        g_assert (NULL != browser);
 
-       browser->priv = DMAP_MDNS_BROWSER_GET_PRIVATE (browser);
+       browser->priv = dmap_mdns_browser_get_instance_private(browser);
 }
 
 static void
diff --git a/libdmapsharing/dmap-mdns-browser-howl.c b/libdmapsharing/dmap-mdns-browser-howl.c
index 8c32395..b8ae855 100644
--- a/libdmapsharing/dmap-mdns-browser-howl.c
+++ b/libdmapsharing/dmap-mdns-browser-howl.c
@@ -77,14 +77,11 @@ static void dmap_mdns_browser_init (DmapMdnsBrowser * browser);
 static void dmap_mdns_browser_dispose (GObject * object);
 static void dmap_mdns_browser_finalize (GObject * object);
 
-#define DMAP_MDNS_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_BROWSER, 
DmapMdnsBrowserPrivate))
-
 static guint signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE_WITH_CODE (DmapMdnsBrowser,
-                         dmap_mdns_browser,
-                         G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (DmapMdnsBrowser));
+G_DEFINE_TYPE_WITH_PRIVATE (DmapMdnsBrowser,
+                            dmap_mdns_browser,
+                            G_TYPE_OBJECT);
 
 GQuark
 dmap_mdns_browser_error_quark (void)
@@ -460,9 +457,10 @@ dmap_mdns_browser_class_init (DmapMdnsBrowserClass * klass)
 static void
 dmap_mdns_browser_init (DmapMdnsBrowser * browser)
 {
-       browser->priv = DMAP_MDNS_BROWSER_GET_PRIVATE (browser);
        memset (browser->priv, 0, sizeof (DmapMdnsBrowserPrivate));
 
+       browser->priv = dmap_mdns_browser_get_instance_private(browser);
+
        set_local_address (browser);
 
        howl_client_init (browser);
diff --git a/libdmapsharing/dmap-mdns-publisher-avahi.c b/libdmapsharing/dmap-mdns-publisher-avahi.c
index 5e71551..1d3ebd5 100644
--- a/libdmapsharing/dmap-mdns-publisher-avahi.c
+++ b/libdmapsharing/dmap-mdns-publisher-avahi.c
@@ -42,8 +42,6 @@ static void dmap_mdns_publisher_class_init (DmapMdnsPublisherClass * klass);
 static void dmap_mdns_publisher_init (DmapMdnsPublisher * publisher);
 static void _finalize (GObject * object);
 
-#define DMAP_MDNS_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_PUBLISHER, 
DmapMdnsPublisherPrivate))
-
 struct DmapMdnsPublisherService
 {
        char *name;
@@ -69,10 +67,9 @@ enum
 
 static guint _signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE_WITH_CODE (DmapMdnsPublisher,
-                         dmap_mdns_publisher,
-                         G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (DmapMdnsPublisher));
+G_DEFINE_TYPE_WITH_PRIVATE (DmapMdnsPublisher,
+                            dmap_mdns_publisher,
+                            G_TYPE_OBJECT);
 
 static gpointer _publisher_object = NULL;
 
@@ -428,8 +425,7 @@ dmap_mdns_publisher_class_init (DmapMdnsPublisherClass * klass)
 static void
 dmap_mdns_publisher_init (DmapMdnsPublisher * publisher)
 {
-       publisher->priv = DMAP_MDNS_PUBLISHER_GET_PRIVATE (publisher);
-
+       publisher->priv = dmap_mdns_publisher_get_instance_private(publisher);
        publisher->priv->client = dmap_mdns_avahi_get_client ();
        publisher->priv->entry_group = NULL;
        publisher->priv->service = NULL;
diff --git a/libdmapsharing/dmap-mdns-publisher-dnssd.c b/libdmapsharing/dmap-mdns-publisher-dnssd.c
index 98ff68f..4f26fd7 100644
--- a/libdmapsharing/dmap-mdns-publisher-dnssd.c
+++ b/libdmapsharing/dmap-mdns-publisher-dnssd.c
@@ -26,8 +26,6 @@
 
 #include "dmap-mdns-publisher.h"
 
-#define DMAP_MDNS_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_PUBLISHER, 
DmapMdnsPublisherPrivate))
-
 struct DmapMdnsPublisherPrivate {
        DNSServiceRef    sdref;
         char            *name;
@@ -41,10 +39,9 @@ enum {
 
 static guint _signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE_WITH_CODE (DmapMdnsPublisher,
-                         dmap_mdns_publisher,
-                         G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (DmapMdnsPublisher))
+G_DEFINE_TYPE_WITH_PRIVATE (DmapMdnsPublisher,
+                            dmap_mdns_publisher,
+                            G_TYPE_OBJECT);
 
 static gpointer _publisher_object = NULL;
 
@@ -249,7 +246,7 @@ dmap_mdns_publisher_class_init (DmapMdnsPublisherClass *klass)
 static void
 dmap_mdns_publisher_init (DmapMdnsPublisher *publisher)
 {
-        publisher->priv = DMAP_MDNS_PUBLISHER_GET_PRIVATE (publisher);
+       publisher->priv = dmap_mdns_publisher_get_instance_private(publisher);
 }
 
 DmapMdnsPublisher *
diff --git a/libdmapsharing/dmap-mdns-service.c b/libdmapsharing/dmap-mdns-service.c
index 3db1746..d0d1514 100644
--- a/libdmapsharing/dmap-mdns-service.c
+++ b/libdmapsharing/dmap-mdns-service.c
@@ -134,12 +134,9 @@ _get_property (GObject *object,
 static void _dispose (GObject * object);
 static void _finalize (GObject * object);
 
-#define DMAP_MDNS_SERVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_SERVICE, 
DmapMdnsServicePrivate))
-
-G_DEFINE_TYPE_WITH_CODE (DmapMdnsService,
-                         dmap_mdns_service,
-                         G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (DmapMdnsService));
+G_DEFINE_TYPE_WITH_PRIVATE (DmapMdnsService,
+                            dmap_mdns_service,
+                            G_TYPE_OBJECT);
 
 static void
 dmap_mdns_service_class_init (DmapMdnsServiceClass * klass)
@@ -217,7 +214,7 @@ dmap_mdns_service_class_init (DmapMdnsServiceClass * klass)
 static void
 dmap_mdns_service_init (DmapMdnsService * service)
 {
-       service->priv = DMAP_MDNS_SERVICE_GET_PRIVATE (service);
+       service->priv = dmap_mdns_service_get_instance_private(service);
 }
 
 static void
diff --git a/libdmapsharing/dmap-share.c b/libdmapsharing/dmap-share.c
index 780f706..320c691 100644
--- a/libdmapsharing/dmap-share.c
+++ b/libdmapsharing/dmap-share.c
@@ -123,12 +123,9 @@ struct share_bitwise_t
 static void dmap_share_init (DmapShare * share);
 static void dmap_share_class_init (DmapShareClass * klass);
 
-G_DEFINE_ABSTRACT_TYPE_WITH_CODE (DmapShare,
-                                  dmap_share,
-                                  G_TYPE_OBJECT,
-                                  G_ADD_PRIVATE (DmapShare))
-#define DMAP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-                                  DMAP_TYPE_SHARE, DmapSharePrivate));
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (DmapShare,
+                                     dmap_share,
+                                     G_TYPE_OBJECT);
 
 static gboolean
 _soup_auth_callback (G_GNUC_UNUSED SoupAuthDomain * auth_domain,
@@ -1686,7 +1683,7 @@ dmap_share_class_init (DmapShareClass * klass)
 static void
 dmap_share_init (DmapShare * share)
 {
-       share->priv = DMAP_SHARE_GET_PRIVATE (share);
+       share->priv = dmap_share_get_instance_private(share);
 
        share->priv->revision_number = 5;
        share->priv->auth_method = DMAP_SHARE_AUTH_METHOD_NONE;
@@ -1856,12 +1853,6 @@ dmap_share_client_requested (DmapBits bits, gint field)
        return 0 != (bits & (((DmapBits) 1) << field));
 }
 
-static gboolean
-_uri_is_local (const char *text_uri)
-{
-       return g_str_has_prefix (text_uri, "file://");
-}
-
 void
 dmap_share_login (DmapShare * share,
                   SoupMessage * message,
diff --git a/libdmapsharing/test-dmap-av-record.c b/libdmapsharing/test-dmap-av-record.c
index 7d27f00..8b693f9 100644
--- a/libdmapsharing/test-dmap-av-record.c
+++ b/libdmapsharing/test-dmap-av-record.c
@@ -268,12 +268,6 @@ static GInputStream *_read (DmapAvRecord *record, GError **error)
        return stream;
 }
 
-static void
-test_dmap_av_record_init (TestDmapAvRecord *record)
-{
-       record->priv = TEST_DMAP_AV_RECORD_GET_PRIVATE (record);
-}
-
 static void test_dmap_av_record_dispose  (GObject *object);
 static void test_dmap_av_record_finalize (GObject *object);
 
@@ -341,6 +335,12 @@ G_DEFINE_TYPE_WITH_CODE (TestDmapAvRecord, test_dmap_av_record, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (DMAP_TYPE_RECORD, _dmap_record_iface_init)
                          G_ADD_PRIVATE (TestDmapAvRecord))
 
+static void
+test_dmap_av_record_init (TestDmapAvRecord *record)
+{
+       record->priv = test_dmap_av_record_get_instance_private(record);
+}
+
 static void
 test_dmap_av_record_dispose (GObject *object)
 {
diff --git a/libdmapsharing/test-dmap-av-record.h b/libdmapsharing/test-dmap-av-record.h
index 093cf1b..a12cc22 100644
--- a/libdmapsharing/test-dmap-av-record.h
+++ b/libdmapsharing/test-dmap-av-record.h
@@ -38,9 +38,6 @@ G_BEGIN_DECLS
 #define TEST_DMAP_AV_RECORD_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
                                       TYPE_TEST_DMAP_AV_RECORD, \
                                       TestDmapAvRecordClass))
-#define TEST_DMAP_AV_RECORD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-                                        TYPE_TEST_DMAP_AV_RECORD, \
-                                        TestDmapAvRecordPrivate))
 
 typedef struct TestDmapAvRecordPrivate TestDmapAvRecordPrivate;
 
diff --git a/libdmapsharing/test-dmap-db.c b/libdmapsharing/test-dmap-db.c
index bb89787..8e0451b 100644
--- a/libdmapsharing/test-dmap-db.c
+++ b/libdmapsharing/test-dmap-db.c
@@ -73,18 +73,6 @@ test_dmap_db_add (DmapDb *db, DmapRecord *record, G_GNUC_UNUSED GError **error)
        return id;
 }
 
-static void
-test_dmap_db_init (TestDmapDb *db)
-{
-       db->priv = TEST_DMAP_DB_GET_PRIVATE (db);
-       db->priv->db = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_object_unref);
-
-       /* Media ID's start at max and go down.
-        * Container ID's start at 1 and go up.
-        */
-       db->priv->nextid = G_MAXINT;
-}
-
 static void
 _dmap_db_iface_init (gpointer iface)
 {
@@ -103,6 +91,19 @@ G_DEFINE_TYPE_WITH_CODE (TestDmapDb, test_dmap_db, G_TYPE_OBJECT,
                                                 _dmap_db_iface_init)
                          G_ADD_PRIVATE (TestDmapDb))
 
+static void
+test_dmap_db_init (TestDmapDb *db)
+{
+       db->priv = test_dmap_db_get_instance_private(db);
+
+       db->priv->db = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_object_unref);
+
+       /* Media ID's start at max and go down.
+        * Container ID's start at 1 and go up.
+        */
+       db->priv->nextid = G_MAXINT;
+}
+
 static void
 _finalize(GObject *object)
 {
diff --git a/libdmapsharing/test-dmap-db.h b/libdmapsharing/test-dmap-db.h
index 404bd29..47caeea 100644
--- a/libdmapsharing/test-dmap-db.h
+++ b/libdmapsharing/test-dmap-db.h
@@ -36,9 +36,6 @@ G_BEGIN_DECLS
                                     TYPE_TEST_DMAP_DB_CLASS))
 #define TEST_DMAP_DB_GET_CLASS(o)   (G_TYPE_INSTANCE_GET_CLASS ((o), \
                                     TYPE_TEST_DMAP_DB, TestDmapDbClass))
-#define TEST_DMAP_DB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-                                    TYPE_TEST_DMAP_DB, \
-                                    TestDmapDbPrivate))
 
 typedef struct TestDmapDbPrivate TestDmapDbPrivate;
 
diff --git a/libdmapsharing/test-dmap-image-record.c b/libdmapsharing/test-dmap-image-record.c
index d022626..dc7745b 100644
--- a/libdmapsharing/test-dmap-image-record.c
+++ b/libdmapsharing/test-dmap-image-record.c
@@ -182,14 +182,6 @@ GInputStream *test_dmap_image_record_read (DmapImageRecord *record, GError **err
        return stream;
 }
 
-
-
-static void
-test_dmap_image_record_init (TestDmapImageRecord *record)
-{
-       record->priv = TEST_DMAP_IMAGE_RECORD_GET_PRIVATE (record);
-}
-
 static void test_dmap_image_record_finalize (GObject *object);
 
 static void
@@ -238,6 +230,12 @@ G_DEFINE_TYPE_WITH_CODE (TestDmapImageRecord, test_dmap_image_record, G_TYPE_OBJ
                          G_IMPLEMENT_INTERFACE (DMAP_TYPE_RECORD, _dmap_record_iface_init)
                          G_ADD_PRIVATE (TestDmapImageRecord))
 
+static void
+test_dmap_image_record_init (TestDmapImageRecord *record)
+{
+       record->priv = test_dmap_image_record_get_instance_private(record);
+}
+
 static void
 test_dmap_image_record_finalize (GObject *object)
 {
diff --git a/libdmapsharing/test-dmap-image-record.h b/libdmapsharing/test-dmap-image-record.h
index b6a31dd..7a47cd8 100644
--- a/libdmapsharing/test-dmap-image-record.h
+++ b/libdmapsharing/test-dmap-image-record.h
@@ -38,9 +38,6 @@ G_BEGIN_DECLS
 #define TEST_DMAP_IMAGE_RECORD_GET_CLASS(o)    (G_TYPE_INSTANCE_GET_CLASS ((o), \
                                         TYPE_TEST_DMAP_IMAGE_RECORD, \
                                         TestDmapImageRecordClass))
-#define TEST_DMAP_IMAGE_RECORD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-                                        TYPE_TEST_DMAP_IMAGE_RECORD, \
-                                        TestDmapImageRecordPrivate))
 
 typedef struct TestDmapImageRecordPrivate TestDmapImageRecordPrivate;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]