[libdmapsharing] Move from IS_DMAP... to DMAP_IS...
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing] Move from IS_DMAP... to DMAP_IS...
- Date: Tue, 30 Jun 2020 00:55:08 +0000 (UTC)
commit 05f4a59ce6a42e03a9da33c5bc8abdf94e50e433
Author: W. Michael Petullo <mike flyn org>
Date: Mon Jun 29 19:54:56 2020 -0500
Move from IS_DMAP... to DMAP_IS...
libdmapsharing/dmap-av-connection.h | 8 ++++----
libdmapsharing/dmap-av-record.h | 4 ++--
libdmapsharing/dmap-av-share.h | 8 ++++----
libdmapsharing/dmap-connection.c | 10 +++++-----
libdmapsharing/dmap-connection.h | 8 ++++----
libdmapsharing/dmap-container-db.h | 4 ++--
libdmapsharing/dmap-container-record.h | 4 ++--
libdmapsharing/dmap-control-connection.h | 8 ++++----
libdmapsharing/dmap-control-player.h | 4 ++--
libdmapsharing/dmap-control-share.h | 8 ++++----
libdmapsharing/dmap-db.c | 2 +-
libdmapsharing/dmap-db.h | 4 ++--
libdmapsharing/dmap-gst-input-stream.h | 4 ++--
libdmapsharing/dmap-gst-mp3-input-stream.h | 4 ++--
libdmapsharing/dmap-gst-qt-input-stream.h | 4 ++--
libdmapsharing/dmap-gst-wav-input-stream.h | 4 ++--
libdmapsharing/dmap-image-connection.h | 8 ++++----
libdmapsharing/dmap-image-record.h | 4 ++--
libdmapsharing/dmap-image-share.h | 8 ++++----
libdmapsharing/dmap-mdns-browser.h | 8 ++++----
libdmapsharing/dmap-mdns-publisher-avahi.c | 2 +-
libdmapsharing/dmap-mdns-publisher-dnssd.c | 2 +-
libdmapsharing/dmap-mdns-publisher.h | 4 ++--
libdmapsharing/dmap-mdns-service.h | 8 ++++----
libdmapsharing/dmap-record-factory.h | 4 ++--
libdmapsharing/dmap-record.h | 4 ++--
libdmapsharing/dmap-share.h | 8 ++++----
tests/test-dmap-client.c | 4 ++--
28 files changed, 76 insertions(+), 76 deletions(-)
---
diff --git a/libdmapsharing/dmap-av-connection.h b/libdmapsharing/dmap-av-connection.h
index 5ac25bf..bb9a234 100644
--- a/libdmapsharing/dmap-av-connection.h
+++ b/libdmapsharing/dmap-av-connection.h
@@ -47,20 +47,20 @@ G_BEGIN_DECLS
*/
#define DMAP_AV_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DMAP_TYPE_AV_CONNECTION,
DmapAvConnectionClass))
/**
- * IS_DMAP_AV_CONNECTION:
+ * DMAP_IS_AV_CONNECTION:
* @o: Instance to check for being a %DMAP_TYPE_AV_CONNECTION.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_AV_CONNECTION.
*/
-#define IS_DMAP_AV_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_AV_CONNECTION))
+#define DMAP_IS_AV_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_AV_CONNECTION))
/**
- * IS_DMAP_AV_CONNECTION_CLASS:
+ * DMAP_IS_AV_CONNECTION_CLASS:
* @k: a #DmapAvConnectionClass
*
* Checks whether @k "is a" valid #DmapAvConnectionClass structure of type
* %DMAP_AV_CONNECTION or derived.
*/
-#define IS_DMAP_AV_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_AV_CONNECTION))
+#define DMAP_IS_AV_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_AV_CONNECTION))
/**
* DMAP_AV_CONNECTION_GET_CLASS:
* @o: a #DmapAvConnection instance.
diff --git a/libdmapsharing/dmap-av-record.h b/libdmapsharing/dmap-av-record.h
index 4b772d9..61f09a3 100644
--- a/libdmapsharing/dmap-av-record.h
+++ b/libdmapsharing/dmap-av-record.h
@@ -45,12 +45,12 @@ G_BEGIN_DECLS
#define DMAP_AV_RECORD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
DMAP_TYPE_AV_RECORD, DmapAvRecord))
/**
- * IS_DMAP_AV_RECORD:
+ * DMAP_IS_AV_RECORD:
* @o: Instance to check for being a %DMAP_TYPE_AV_RECORD.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_AV_RECORD.
*/
-#define IS_DMAP_AV_RECORD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_AV_RECORD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_AV_RECORD))
/**
* DMAP_AV_RECORD_GET_INTERFACE:
diff --git a/libdmapsharing/dmap-av-share.h b/libdmapsharing/dmap-av-share.h
index 0c02b40..a017435 100644
--- a/libdmapsharing/dmap-av-share.h
+++ b/libdmapsharing/dmap-av-share.h
@@ -56,21 +56,21 @@ G_BEGIN_DECLS
#define DMAP_AV_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
DMAP_TYPE_AV_SHARE, DmapAvShareClass))
/**
- * IS_DMAP_AV_SHARE:
+ * DMAP_IS_AV_SHARE:
* @o: Instance to check for being a %DMAP_TYPE_AV_SHARE.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_AV_SHARE.
*/
-#define IS_DMAP_AV_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_AV_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_AV_SHARE))
/**
- * IS_DMAP_AV_SHARE_CLASS:
+ * DMAP_IS_AV_SHARE_CLASS:
* @k: a #DmapAvShareClass
*
* Checks whether @k "is a" valid #DmapAvShareClass structure of type
* %DMAP_AV_SHARE or derived.
*/
-#define IS_DMAP_AV_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
+#define DMAP_IS_AV_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
DMAP_TYPE_AV_SHARE))
/**
* DMAP_AV_SHARE_GET_CLASS:
diff --git a/libdmapsharing/dmap-connection.c b/libdmapsharing/dmap-connection.c
index ed8dc21..3a4bb2a 100644
--- a/libdmapsharing/dmap-connection.c
+++ b/libdmapsharing/dmap-connection.c
@@ -195,7 +195,7 @@ _finalize (GObject * object)
{
g_debug ("Finalize");
- g_assert(IS_DMAP_CONNECTION (object));
+ g_assert(DMAP_IS_CONNECTION (object));
DmapConnection *connection = DMAP_CONNECTION (object);
if (NULL == connection->priv) {
@@ -1400,7 +1400,7 @@ _handle_logout (DmapConnection * connection, G_GNUC_UNUSED guint status,
static void
_finish (DmapConnection * connection)
{
- g_assert(IS_DMAP_CONNECTION (connection));
+ g_assert(DMAP_IS_CONNECTION (connection));
g_debug ("DMAP finish");
connection->priv->state = DMAP_DONE;
@@ -1561,7 +1561,7 @@ _do_something (DmapConnection * connection)
gboolean
dmap_connection_is_connected (DmapConnection * connection)
{
- g_assert(IS_DMAP_CONNECTION (connection));
+ g_assert(DMAP_IS_CONNECTION (connection));
return connection->priv->is_connected;
}
@@ -1674,7 +1674,7 @@ dmap_connection_start (DmapConnection * connection,
{
ConnectionResponseData *rdata;
- g_assert(IS_DMAP_CONNECTION (connection));
+ g_assert(DMAP_IS_CONNECTION (connection));
g_assert(connection->priv->state == DMAP_GET_INFO);
g_debug ("Creating new DMAP connection to %s:%d",
@@ -1737,7 +1737,7 @@ dmap_connection_stop(DmapConnection * connection,
DmapConnectionPrivate *priv = connection->priv;
ConnectionResponseData *rdata;
- g_assert(IS_DMAP_CONNECTION (connection));
+ g_assert(DMAP_IS_CONNECTION (connection));
g_debug ("Disconnecting");
diff --git a/libdmapsharing/dmap-connection.h b/libdmapsharing/dmap-connection.h
index e9f2cab..e523034 100644
--- a/libdmapsharing/dmap-connection.h
+++ b/libdmapsharing/dmap-connection.h
@@ -61,20 +61,20 @@ typedef struct {
*/
#define DMAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DMAP_TYPE_CONNECTION,
DmapConnectionClass))
/**
- * IS_DMAP_CONNECTION:
+ * DMAP_IS_CONNECTION:
* @o: Instance to check for being a %DMAP_TYPE_CONNECTION.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_CONNECTION.
*/
-#define IS_DMAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_CONNECTION))
+#define DMAP_IS_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_CONNECTION))
/**
- * IS_DMAP_CONNECTION_CLASS:
+ * DMAP_IS_CONNECTION_CLASS:
* @k: a #DmapConnectionClass
*
* Checks whether @k "is a" valid #DmapConnectionClass structure of type
* %DMAP_CONNECTION or derived.
*/
-#define IS_DMAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_CONNECTION))
+#define DMAP_IS_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_CONNECTION))
/**
* DMAP_CONNECTION_GET_CLASS:
* @o: a #DmapConnection instance.
diff --git a/libdmapsharing/dmap-container-db.h b/libdmapsharing/dmap-container-db.h
index e76bb05..a48f78d 100644
--- a/libdmapsharing/dmap-container-db.h
+++ b/libdmapsharing/dmap-container-db.h
@@ -43,13 +43,13 @@ G_BEGIN_DECLS
#define DMAP_CONTAINER_DB(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
DMAP_TYPE_CONTAINER_DB, DmapContainerDb))
/**
- * IS_DMAP_CONTAINER_DB:
+ * DMAP_IS_CONTAINER_DB:
* @o: Instance to check for being a %DMAP_TYPE_CONTAINER_DB.
*
* Checks whether a valid #GTypeInstance pointer is of type
* %DMAP_TYPE_CONTAINER_DB.
*/
-#define IS_DMAP_CONTAINER_DB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_CONTAINER_DB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_CONTAINER_DB))
/**
* DMAP_CONTAINER_DB_GET_INTERFACE:
diff --git a/libdmapsharing/dmap-container-record.h b/libdmapsharing/dmap-container-record.h
index 4111e42..710eacf 100644
--- a/libdmapsharing/dmap-container-record.h
+++ b/libdmapsharing/dmap-container-record.h
@@ -42,13 +42,13 @@ G_BEGIN_DECLS
#define DMAP_CONTAINER_RECORD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
DMAP_TYPE_CONTAINER_RECORD, DmapContainerRecord))
/**
- * IS_DMAP_CONTAINER_RECORD:
+ * DMAP_IS_CONTAINER_RECORD:
* @o: Instance to check for being a %DMAP_TYPE_CONTAINER_RECORD.
*
* Checks whether a valid #GTypeInstance pointer is of type
* %DMAP_TYPE_CONTAINER_RECORD.
*/
-#define IS_DMAP_CONTAINER_RECORD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_CONTAINER_RECORD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_CONTAINER_RECORD))
/**
* DMAP_CONTAINER_RECORD_GET_INTERFACE:
diff --git a/libdmapsharing/dmap-control-connection.h b/libdmapsharing/dmap-control-connection.h
index ef5845c..7a17307 100644
--- a/libdmapsharing/dmap-control-connection.h
+++ b/libdmapsharing/dmap-control-connection.h
@@ -47,20 +47,20 @@ G_BEGIN_DECLS
*/
#define DMAP_CONTROL_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DACP_TYPE_CONNECTION,
DmapControlConnectionClass))
/**
- * IS_DMAP_CONTROL_CONNECTION:
+ * DMAP_IS_CONTROL_CONNECTION:
* @o: Instance to check for being a %DACP_TYPE_CONNECTION.
*
* Checks whether a valid #GTypeInstance pointer is of type %DACP_TYPE_CONNECTION.
*/
-#define IS_DMAP_CONTROL_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DACP_TYPE_CONNECTION))
+#define DMAP_IS_CONTROL_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DACP_TYPE_CONNECTION))
/**
- * IS_DMAP_CONTROL_CONNECTION_CLASS:
+ * DMAP_IS_CONTROL_CONNECTION_CLASS:
* @k: a #DmapControlConnectionClass
*
* Checks whether @k "is a" valid #DmapControlConnectionClass structure of type
* %DMAP_CONTROL_CONNECTION or derived.
*/
-#define IS_DMAP_CONTROL_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DACP_TYPE_CONNECTION))
+#define DMAP_IS_CONTROL_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DACP_TYPE_CONNECTION))
/**
* DMAP_CONTROL_CONNECTION_GET_CLASS:
* @o: a #DmapControlConnection instance.
diff --git a/libdmapsharing/dmap-control-player.h b/libdmapsharing/dmap-control-player.h
index 180f5a4..c326055 100644
--- a/libdmapsharing/dmap-control-player.h
+++ b/libdmapsharing/dmap-control-player.h
@@ -39,12 +39,12 @@ G_BEGIN_DECLS
*/
#define DMAP_CONTROL_PLAYER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DMAP_TYPE_CONTROL_PLAYER,
DmapControlPlayer))
/**
- * IS_DMAP_CONTROL_PLAYER:
+ * DMAP_IS_CONTROL_PLAYER:
* @o: Instance to check for being a %DMAP_TYPE_CONTROL_PLAYER.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_CONTROL_PLAYER.
*/
-#define IS_DMAP_CONTROL_PLAYER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_CONTROL_PLAYER))
+#define DMAP_IS_CONTROL_PLAYER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_CONTROL_PLAYER))
/**
* DMAP_CONTROL_PLAYER_GET_INTERFACE:
* @o: a #DmapControlPlayer instance.
diff --git a/libdmapsharing/dmap-control-share.h b/libdmapsharing/dmap-control-share.h
index 6e46ccd..2305dbb 100644
--- a/libdmapsharing/dmap-control-share.h
+++ b/libdmapsharing/dmap-control-share.h
@@ -56,21 +56,21 @@ G_BEGIN_DECLS
#define DMAP_CONTROL_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
DMAP_TYPE_CONTROL_SHARE, DmapControlShareClass))
/**
- * IS_DMAP_CONTROL_SHARE:
+ * DMAP_IS_CONTROL_SHARE:
* @o: Instance to check for being a %DMAP_TYPE_CONTROL_SHARE.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_CONTROL_SHARE.
*/
-#define IS_DMAP_CONTROL_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_CONTROL_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_CONTROL_SHARE))
/**
- * IS_DMAP_CONTROL_SHARE_CLASS:
+ * DMAP_IS_CONTROL_SHARE_CLASS:
* @k: a #DmapControlShareClass
*
* Checks whether @k "is a" valid #DmapControlShareClass structure of type
* %DMAP_CONTROL_SHARE or derived.
*/
-#define IS_DMAP_CONTROL_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
+#define DMAP_IS_CONTROL_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
DMAP_TYPE_CONTROL_SHARE))
/**
* DMAP_CONTROL_SHARE_GET_CLASS:
diff --git a/libdmapsharing/dmap-db.c b/libdmapsharing/dmap-db.c
index 62a88e1..ec51920 100644
--- a/libdmapsharing/dmap-db.c
+++ b/libdmapsharing/dmap-db.c
@@ -172,7 +172,7 @@ done:
static void
_apply_filter (guint id, DmapRecord * record, gpointer data)
{
- g_assert(IS_DMAP_RECORD (record));
+ g_assert(DMAP_IS_RECORD (record));
FilterData *fd;
gboolean accept = FALSE;
diff --git a/libdmapsharing/dmap-db.h b/libdmapsharing/dmap-db.h
index 25b64df..71f455f 100644
--- a/libdmapsharing/dmap-db.h
+++ b/libdmapsharing/dmap-db.h
@@ -43,12 +43,12 @@ G_BEGIN_DECLS
#define DMAP_DB(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
DMAP_TYPE_DB, DmapDb))
/**
- * IS_DMAP_DB:
+ * DMAP_IS_DB:
* @o: Instance to check for being a %DMAP_TYPE_DB.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_DB.
*/
-#define IS_DMAP_DB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_DB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_DB))
/**
* DMAP_DB_GET_INTERFACE:
diff --git a/libdmapsharing/dmap-gst-input-stream.h b/libdmapsharing/dmap-gst-input-stream.h
index 6aede5c..4004bee 100644
--- a/libdmapsharing/dmap-gst-input-stream.h
+++ b/libdmapsharing/dmap-gst-input-stream.h
@@ -37,9 +37,9 @@ G_BEGIN_DECLS
#define DMAP_GST_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
DMAP_TYPE_GST_INPUT_STREAM, \
DmapGstInputStreamClass))
-#define IS_DMAP_GST_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_GST_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_GST_INPUT_STREAM))
-#define IS_DMAP_GST_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
+#define DMAP_IS_GST_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
DMAP_TYPE_GST_INPUT_STREAM_CLASS))
#define DMAP_GST_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
DMAP_TYPE_GST_INPUT_STREAM, \
diff --git a/libdmapsharing/dmap-gst-mp3-input-stream.h b/libdmapsharing/dmap-gst-mp3-input-stream.h
index ac95dfe..badf9fd 100644
--- a/libdmapsharing/dmap-gst-mp3-input-stream.h
+++ b/libdmapsharing/dmap-gst-mp3-input-stream.h
@@ -35,9 +35,9 @@ G_BEGIN_DECLS
#define DMAP_GST_MP3_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
DMAP_TYPE_GST_MP3_INPUT_STREAM, \
DmapGstMP3InputStreamClass))
-#define IS_DMAP_GST_MP3_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_GST_MP3_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_GST_MP3_INPUT_STREAM))
-#define IS_DMAP_GST_MP3_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
+#define DMAP_IS_GST_MP3_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
DMAP_TYPE_GST_MP3_INPUT_STREAM_CLASS))
#define DMAP_GST_MP3_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
DMAP_TYPE_GST_MP3_INPUT_STREAM, \
diff --git a/libdmapsharing/dmap-gst-qt-input-stream.h b/libdmapsharing/dmap-gst-qt-input-stream.h
index 9f4dffa..9b084ea 100644
--- a/libdmapsharing/dmap-gst-qt-input-stream.h
+++ b/libdmapsharing/dmap-gst-qt-input-stream.h
@@ -35,9 +35,9 @@ G_BEGIN_DECLS
#define DMAP_GST_QT_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
DMAP_TYPE_GST_QT_INPUT_STREAM, \
DmapGstQtInputStreamClass))
-#define IS_DMAP_GST_QT_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_GST_QT_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_GST_QT_INPUT_STREAM))
-#define IS_DMAP_GST_QT_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
+#define DMAP_IS_GST_QT_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
DMAP_TYPE_GST_QT_INPUT_STREAM_CLASS))
#define DMAP_GST_QT_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
DMAP_TYPE_GST_QT_INPUT_STREAM, \
diff --git a/libdmapsharing/dmap-gst-wav-input-stream.h b/libdmapsharing/dmap-gst-wav-input-stream.h
index e03e77a..31cfba5 100644
--- a/libdmapsharing/dmap-gst-wav-input-stream.h
+++ b/libdmapsharing/dmap-gst-wav-input-stream.h
@@ -35,9 +35,9 @@ G_BEGIN_DECLS
#define DMAP_GST_WAV_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
DMAP_TYPE_GST_WAV_INPUT_STREAM, \
DmapGstWavInputStreamClass))
-#define IS_DMAP_GST_WAV_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_GST_WAV_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_GST_WAV_INPUT_STREAM))
-#define IS_DMAP_GST_WAV_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
+#define DMAP_IS_GST_WAV_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
DMAP_TYPE_GST_WAV_INPUT_STREAM_CLASS))
#define DMAP_GST_WAV_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
DMAP_TYPE_GST_WAV_INPUT_STREAM, \
diff --git a/libdmapsharing/dmap-image-connection.h b/libdmapsharing/dmap-image-connection.h
index 0a96b53..47bc911 100644
--- a/libdmapsharing/dmap-image-connection.h
+++ b/libdmapsharing/dmap-image-connection.h
@@ -47,20 +47,20 @@ G_BEGIN_DECLS
*/
#define DMAP_IMAGE_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DMAP_TYPE_IMAGE_CONNECTION,
DmapImageConnectionClass))
/**
- * IS_DMAP_IMAGE_CONNECTION:
+ * DMAP_IS_IMAGE_CONNECTION:
* @o: Instance to check for being a %DMAP_TYPE_IMAGE_CONNECTION.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_IMAGE_CONNECTION.
*/
-#define IS_DMAP_IMAGE_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_IMAGE_CONNECTION))
+#define DMAP_IS_IMAGE_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_IMAGE_CONNECTION))
/**
- * IS_DMAP_IMAGE_CONNECTION_CLASS:
+ * DMAP_IS_IMAGE_CONNECTION_CLASS:
* @k: a #DmapImageConnectionClass
*
* Checks whether @k "is a" valid #DmapImageConnectionClass structure of type
* %DMAP_IMAGE_CONNECTION or derived.
*/
-#define IS_DMAP_IMAGE_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_IMAGE_CONNECTION))
+#define DMAP_IS_IMAGE_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_IMAGE_CONNECTION))
/**
* DMAP_IMAGE_CONNECTION_GET_CLASS:
* @o: a #DmapImageConnection instance.
diff --git a/libdmapsharing/dmap-image-record.h b/libdmapsharing/dmap-image-record.h
index dd0f74c..66fcdcc 100644
--- a/libdmapsharing/dmap-image-record.h
+++ b/libdmapsharing/dmap-image-record.h
@@ -44,12 +44,12 @@ G_BEGIN_DECLS
#define DMAP_IMAGE_RECORD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
DMAP_TYPE_IMAGE_RECORD, DmapImageRecord))
/**
- * IS_DMAP_IMAGE_RECORD:
+ * DMAP_IS_IMAGE_RECORD:
* @o: Instance to check for being a %DMAP_TYPE_IMAGE_RECORD.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_IMAGE_RECORD.
*/
-#define IS_DMAP_IMAGE_RECORD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_IMAGE_RECORD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_IMAGE_RECORD))
/**
* DMAP_IMAGE_RECORD_GET_INTERFACE:
diff --git a/libdmapsharing/dmap-image-share.h b/libdmapsharing/dmap-image-share.h
index 623d304..3c46449 100644
--- a/libdmapsharing/dmap-image-share.h
+++ b/libdmapsharing/dmap-image-share.h
@@ -54,21 +54,21 @@ G_BEGIN_DECLS
#define DMAP_IMAGE_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
DMAP_TYPE_IMAGE_SHARE, DmapImageShareClass))
/**
- * IS_DMAP_IMAGE_SHARE:
+ * DMAP_IS_IMAGE_SHARE:
* @o: Instance to check for being a %DMAP_TYPE_IMAGE_SHARE.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_IMAGE_SHARE.
*/
-#define IS_DMAP_IMAGE_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_IMAGE_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_IMAGE_SHARE))
/**
- * IS_DMAP_IMAGE_SHARE_CLASS:
+ * DMAP_IS_IMAGE_SHARE_CLASS:
* @k: a #DmapImageShareClass
*
* Checks whether @k "is a" valid #DmapImageShareClass structure of type
* %DMAP_IMAGE_SHARE or derived.
*/
-#define IS_DMAP_IMAGE_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_IMAGE_SHARE))
+#define DMAP_IS_IMAGE_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_IMAGE_SHARE))
/**
* DMAP_IMAGE_SHARE_GET_CLASS:
* @o: a #DmapImageShare instance.
diff --git a/libdmapsharing/dmap-mdns-browser.h b/libdmapsharing/dmap-mdns-browser.h
index 3b51e76..f2693ee 100644
--- a/libdmapsharing/dmap-mdns-browser.h
+++ b/libdmapsharing/dmap-mdns-browser.h
@@ -51,20 +51,20 @@ G_BEGIN_DECLS
*/
#define DMAP_MDNS_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DMAP_TYPE_MDNS_BROWSER,
DmapMdnsBrowserClass))
/**
- * IS_DMAP_MDNS_BROWSER:
+ * DMAP_IS_MDNS_BROWSER:
* @o: Instance to check for being a %DMAP_TYPE_MDNS_BROWSER.
*
* Checks whether a valid #GTypeInstance pointer is of type %DAAP_TYPE_MDNS_BROWSER.
*/
-#define IS_DMAP_MDNS_BROWSER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_MDNS_BROWSER))
+#define DMAP_IS_MDNS_BROWSER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_MDNS_BROWSER))
/**
- * IS_DMAP_MDNS_BROWSER_CLASS:
+ * DMAP_IS_MDNS_BROWSER_CLASS:
* @k: a #DmapMdnsBrowserClass
*
* Checks whether @k "is a" valid #DmapMdnsBrowserClass structure of type
* %DMAP_MDNS_BROWSER or derived.
*/
-#define IS_DMAP_MDNS_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_MDNS_BROWSER))
+#define DMAP_IS_MDNS_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_MDNS_BROWSER))
/**
* DMAP_MDNS_BROWSER_GET_CLASS:
* @o: a #DmapMdnsBrowser instance.
diff --git a/libdmapsharing/dmap-mdns-publisher-avahi.c b/libdmapsharing/dmap-mdns-publisher-avahi.c
index 1d3ebd5..59e83f6 100644
--- a/libdmapsharing/dmap-mdns-publisher-avahi.c
+++ b/libdmapsharing/dmap-mdns-publisher-avahi.c
@@ -437,7 +437,7 @@ _finalize (GObject * object)
DmapMdnsPublisher *publisher;
g_assert(NULL != object);
- g_assert(IS_DMAP_MDNS_PUBLISHER (object));
+ g_assert(DMAP_IS_MDNS_PUBLISHER (object));
publisher = DMAP_MDNS_PUBLISHER (object);
diff --git a/libdmapsharing/dmap-mdns-publisher-dnssd.c b/libdmapsharing/dmap-mdns-publisher-dnssd.c
index 4f26fd7..9ac631c 100644
--- a/libdmapsharing/dmap-mdns-publisher-dnssd.c
+++ b/libdmapsharing/dmap-mdns-publisher-dnssd.c
@@ -201,7 +201,7 @@ _finalize (GObject *object)
DmapMdnsPublisher *publisher;
g_assert(NULL != object);
- g_assert(IS_DMAP_MDNS_PUBLISHER(object));
+ g_assert(DMAP_IS_MDNS_PUBLISHER(object));
publisher = DMAP_MDNS_PUBLISHER (object);
diff --git a/libdmapsharing/dmap-mdns-publisher.h b/libdmapsharing/dmap-mdns-publisher.h
index e756a33..da8290e 100644
--- a/libdmapsharing/dmap-mdns-publisher.h
+++ b/libdmapsharing/dmap-mdns-publisher.h
@@ -31,8 +31,8 @@ G_BEGIN_DECLS
#define DMAP_TYPE_MDNS_PUBLISHER (dmap_mdns_publisher_get_type ())
#define DMAP_MDNS_PUBLISHER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DMAP_TYPE_MDNS_PUBLISHER,
DmapMdnsPublisher))
#define DMAP_MDNS_PUBLISHER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DMAP_TYPE_MDNS_PUBLISHER,
DmapMdnsPublisherClass))
-#define IS_DMAP_MDNS_PUBLISHER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_MDNS_PUBLISHER))
-#define IS_DMAP_MDNS_PUBLISHER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_MDNS_PUBLISHER))
+#define DMAP_IS_MDNS_PUBLISHER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_MDNS_PUBLISHER))
+#define DMAP_IS_MDNS_PUBLISHER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_MDNS_PUBLISHER))
#define DMAP_MDNS_PUBLISHER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DMAP_TYPE_MDNS_PUBLISHER,
DmapMdnsPublisherClass))
typedef struct DmapMdnsPublisherPrivate DmapMdnsPublisherPrivate;
diff --git a/libdmapsharing/dmap-mdns-service.h b/libdmapsharing/dmap-mdns-service.h
index 0aacc40..48f3a8c 100644
--- a/libdmapsharing/dmap-mdns-service.h
+++ b/libdmapsharing/dmap-mdns-service.h
@@ -46,20 +46,20 @@ G_BEGIN_DECLS
*/
#define DMAP_MDNS_SERVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DMAP_TYPE_MDNS_SERVICE,
DmapMdnsServiceClass))
/**
- * IS_DMAP_MDNS_SERVICE:
+ * DMAP_IS_MDNS_SERVICE:
* @o: Instance to check for being a %DMAP_TYPE_MDNS_SERVICE.
*
* Checks whether a valid #GTypeInstance pointer is of type %DAAP_TYPE_MDNS_SERVICE.
*/
-#define IS_DMAP_MDNS_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_MDNS_SERVICE))
+#define DMAP_IS_MDNS_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_MDNS_SERVICE))
/**
- * IS_DMAP_MDNS_SERVICE_CLASS:
+ * DMAP_IS_MDNS_SERVICE_CLASS:
* @k: a #DmapMdnsServiceClass
*
* Checks whether @k "is a" valid #DmapMdnsServiceClass structure of type
* %DMAP_MDNS_SERVICE or derived.
*/
-#define IS_DMAP_MDNS_SERVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_MDNS_SERVICE))
+#define DMAP_IS_MDNS_SERVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_MDNS_SERVICE))
/**
* DMAP_MDNS_SERVICE_GET_CLASS:
* @o: a #DmapMdnsService instance.
diff --git a/libdmapsharing/dmap-record-factory.h b/libdmapsharing/dmap-record-factory.h
index 36fc2cd..d48e603 100644
--- a/libdmapsharing/dmap-record-factory.h
+++ b/libdmapsharing/dmap-record-factory.h
@@ -43,13 +43,13 @@ G_BEGIN_DECLS
#define DMAP_RECORD_FACTORY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
DMAP_TYPE_RECORD_FACTORY, DmapRecordFactory))
/**
- * IS_DMAP_RECORD_FACTORY:
+ * DMAP_IS_RECORD_FACTORY:
* @o: Instance to check for being a %DMAP_TYPE_RECORD_FACTORY.
*
* Checks whether a valid #GTypeInstance pointer is of type
* %DMAP_TYPE_RECORD_FACTORY.
*/
-#define IS_DMAP_RECORD_FACTORY(o)(G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_RECORD_FACTORY(o)(G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_RECORD_FACTORY))
/**
* DMAP_RECORD_FACTORY_GET_INTERFACE:
diff --git a/libdmapsharing/dmap-record.h b/libdmapsharing/dmap-record.h
index 0938f52..b553be6 100644
--- a/libdmapsharing/dmap-record.h
+++ b/libdmapsharing/dmap-record.h
@@ -41,12 +41,12 @@ G_BEGIN_DECLS
#define DMAP_RECORD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
DMAP_TYPE_RECORD, DmapRecord))
/**
- * IS_DMAP_RECORD:
+ * DMAP_IS_RECORD:
* @o: Instance to check for being a %DMAP_TYPE_RECORD.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_RECORD.
*/
-#define IS_DMAP_RECORD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_RECORD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_RECORD))
/**
* DMAP_RECORD_GET_INTERFACE:
diff --git a/libdmapsharing/dmap-share.h b/libdmapsharing/dmap-share.h
index 7b9bc7c..23db199 100644
--- a/libdmapsharing/dmap-share.h
+++ b/libdmapsharing/dmap-share.h
@@ -61,21 +61,21 @@ G_BEGIN_DECLS
#define DMAP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
DMAP_TYPE_SHARE, DmapShareClass))
/**
- * IS_DMAP_SHARE:
+ * DMAP_IS_SHARE:
* @o: Instance to check for being a %DMAP_TYPE_SHARE.
*
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_SHARE.
*/
-#define IS_DMAP_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+#define DMAP_IS_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
DMAP_TYPE_SHARE))
/**
- * IS_DMAP_SHARE_CLASS:
+ * DMAP_IS_SHARE_CLASS:
* @k: a #DmapShareClass
*
* Checks whether @k "is a" valid #DmapShareClass structure of type
* %DMAP_SHARE or derived.
*/
-#define IS_DMAP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
+#define DMAP_IS_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
DMAP_TYPE_SHARE))
/**
* DMAP_SHARE_GET_CLASS:
diff --git a/tests/test-dmap-client.c b/tests/test-dmap-client.c
index dab4a01..711802c 100644
--- a/tests/test-dmap-client.c
+++ b/tests/test-dmap-client.c
@@ -38,7 +38,7 @@ static guint conn_type = DAAP;
static void
print_record (gpointer id, DmapRecord *record, G_GNUC_UNUSED gpointer user_data)
{
- if (IS_DMAP_AV_RECORD(record)) {
+ if (DMAP_IS_AV_RECORD(record)) {
gboolean has_video;
gchar *artist, *title;
@@ -52,7 +52,7 @@ print_record (gpointer id, DmapRecord *record, G_GNUC_UNUSED gpointer user_data)
g_free (artist);
g_free (title);
- } else if (IS_DMAP_IMAGE_RECORD(record)) {
+ } else if (DMAP_IS_IMAGE_RECORD(record)) {
gchar *format, *location;
g_object_get (record,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
