Commit 295dd71f authored by W. Michael Petullo's avatar W. Michael Petullo

Fixes required by Vala API work; migrate Vala API file to 3.0 API

Signed-off-by: W. Michael Petullo's avatarW. Michael Petullo <mike@flyn.org>
parent 4b641b84
......@@ -111,7 +111,7 @@ dmap-enums.h: $(libdmapsharinginclude_HEADERS) Makefile
@glib-mkenums \
--fhead "/* Automatically generated by glib-mkenums */\n\n#ifndef DMAP_ENUMS_H\n#define DMAP_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n\n" \
--fprod "\n/* enumerations from \"@filename@\" */\n" \
--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define TYPE_@ENUMNAME@ (@enum_name@_get_type())\n" \
--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define DMAP_TYPE_@ENUMNAME@ (@enum_name@_get_type())\n" \
--ftail "G_END_DECLS\n\n#endif /* !DMAP_ENUMS_H */" $(addprefix $(srcdir)/,$(libdmapsharinginclude_HEADERS)) > $@.tmp \
&& sed -e "s/d_map/dmap/" -e "s/D_MAP/DMAP/" -e "s/d_acp/dacp/" -e "s/D_ACP/DACP/" $@.tmp > $@ \
&& rm -f $@.tmp
......
......@@ -23,7 +23,7 @@
#include <libdmapsharing/daap-connection.h>
#include <libdmapsharing/dmap-structure.h>
#define DAAP_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DAAP_CONNECTION, DAAPConnectionPrivate))
#define DAAP_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DAAP_TYPE_CONNECTION, DAAPConnectionPrivate))
/* FIXME:
struct DAAPConnectionPrivate {
......@@ -172,7 +172,7 @@ daap_connection_new (const char *name,
{
DAAPConnection *connection;
connection = g_object_new (TYPE_DAAP_CONNECTION,
connection = g_object_new (DAAP_TYPE_CONNECTION,
"name", name,
"password-protected", password_protected,
"db", db,
......@@ -192,4 +192,4 @@ daap_connection_init (DAAPConnection *connection)
*/
}
G_DEFINE_TYPE (DAAPConnection, daap_connection, TYPE_DMAP_CONNECTION)
G_DEFINE_TYPE (DAAPConnection, daap_connection, DMAP_TYPE_CONNECTION)
......@@ -25,11 +25,11 @@
G_BEGIN_DECLS
/**
* TYPE_DAAP_CONNECTION:
* DAAP_TYPE_CONNECTION:
*
* The type for #DAAPConnection.
*/
#define TYPE_DAAP_CONNECTION (daap_connection_get_type ())
#define DAAP_TYPE_CONNECTION (daap_connection_get_type ())
/**
* DAAP_CONNECTION:
* @o: Object which is subject to casting.
......@@ -38,7 +38,7 @@ G_BEGIN_DECLS
* Depending on the current debugging level, this function may invoke
* certain runtime checks to identify invalid casts.
*/
#define DAAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_DAAP_CONNECTION, DAAPConnection))
#define DAAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DAAP_TYPE_CONNECTION, DAAPConnection))
/**
* DAAP_CONNECTION_CLASS:
* @k: a valid #DAAPConnectionClass
......@@ -46,14 +46,14 @@ G_BEGIN_DECLS
* Casts a derived #DAAPConnectionClass structure into a #DAAPConnectionClass
* structure.
*/
#define DAAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_DAAP_CONNECTION, DAAPConnectionClass))
#define DAAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DAAP_TYPE_CONNECTION, DAAPConnectionClass))
/**
* IS_DAAP_CONNECTION:
* @o: Instance to check for being a %TYPE_DAAP_CONNECTION.
* @o: Instance to check for being a %DAAP_TYPE_CONNECTION.
*
* Checks whether a valid #GTypeInstance pointer is of type %TYPE_DAAP_CONNECTION.
* Checks whether a valid #GTypeInstance pointer is of type %DAAP_TYPE_CONNECTION.
*/
#define IS_DAAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_DAAP_CONNECTION))
#define IS_DAAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DAAP_TYPE_CONNECTION))
/**
* IS_DAAP_CONNECTION_CLASS:
* @k: a #DAAPConnectionClass
......@@ -61,7 +61,7 @@ G_BEGIN_DECLS
* Checks whether @k "is a" valid #DAAPConnectionClass structure of type
* %DAAP_CONNECTION or derived.
*/
#define IS_DAAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_DAAP_CONNECTION))
#define IS_DAAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DAAP_TYPE_CONNECTION))
/**
* DAAP_CONNECTION_GET_CLASS:
* @o: a #DAAPConnection instance.
......@@ -70,7 +70,7 @@ G_BEGIN_DECLS
*
* Returns: pointer to object class structure.
*/
#define DAAP_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_DAAP_CONNECTION, DAAPConnectionClass))
#define DAAP_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DAAP_TYPE_CONNECTION, DAAPConnectionClass))
typedef struct DAAPConnectionPrivate DAAPConnectionPrivate;
......
......@@ -88,13 +88,13 @@ struct DAAPSharePrivate {
gchar unused;
};
#define DAAP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DAAP_SHARE, DAAPSharePrivate))
#define DAAP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DAAP_TYPE_SHARE, DAAPSharePrivate))
enum {
PROP_0,
};
G_DEFINE_TYPE (DAAPShare, daap_share, TYPE_DMAP_SHARE)
G_DEFINE_TYPE (DAAPShare, daap_share, DMAP_TYPE_SHARE)
/* FIXME: get rid of this global: */
static gchar *transcode_format = NULL;
......@@ -188,7 +188,7 @@ daap_share_new (const char *name,
g_object_ref (db);
g_object_ref (container_db);
share = DAAP_SHARE (g_object_new (TYPE_DAAP_SHARE,
share = DAAP_SHARE (g_object_new (DAAP_TYPE_SHARE,
"name", name,
"password", password,
"db", db,
......
......@@ -33,11 +33,11 @@
G_BEGIN_DECLS
/**
* TYPE_DAAP_SHARE:
* DAAP_TYPE_SHARE:
*
* The type for #DAAPShare.
*/
#define TYPE_DAAP_SHARE (daap_share_get_type ())
#define DAAP_TYPE_SHARE (daap_share_get_type ())
/**
* DAAP_SHARE:
* @o: Object which is subject to casting.
......@@ -47,7 +47,7 @@ G_BEGIN_DECLS
* certain runtime checks to identify invalid casts.
*/
#define DAAP_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
TYPE_DAAP_SHARE, DAAPShare))
DAAP_TYPE_SHARE, DAAPShare))
/**
* DAAP_SHARE_CLASS:
* @k: a valid #DAAPShareClass
......@@ -55,15 +55,15 @@ G_BEGIN_DECLS
* Casts a derived #DAAPShareClass structure into a #DAAPShareClass structure.
*/
#define DAAP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
TYPE_DAAP_SHARE, DAAPShareClass))
DAAP_TYPE_SHARE, DAAPShareClass))
/**
* IS_DAAP_SHARE:
* @o: Instance to check for being a %TYPE_DAAP_SHARE.
* @o: Instance to check for being a %DAAP_TYPE_SHARE.
*
* Checks whether a valid #GTypeInstance pointer is of type %TYPE_DAAP_SHARE.
* Checks whether a valid #GTypeInstance pointer is of type %DAAP_TYPE_SHARE.
*/
#define IS_DAAP_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
TYPE_DAAP_SHARE))
DAAP_TYPE_SHARE))
/**
* IS_DAAP_SHARE_CLASS:
* @k: a #DAAPShareClass
......@@ -72,7 +72,7 @@ G_BEGIN_DECLS
* %DAAP_SHARE or derived.
*/
#define IS_DAAP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
TYPE_DAAP_SHARE))
DAAP_TYPE_SHARE))
/**
* DAAP_SHARE_GET_CLASS:
* @o: a #DAAPShare instance.
......@@ -82,7 +82,7 @@ G_BEGIN_DECLS
* Returns: pointer to object class structure.
*/
#define DAAP_SHARE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
TYPE_DAAP_SHARE, DAAPShareClass))
DAAP_TYPE_SHARE, DAAPShareClass))
typedef struct DAAPSharePrivate DAAPSharePrivate;
......
......@@ -23,7 +23,7 @@
#include <libdmapsharing/daap-record.h>
static void
dacp_player_init (DACPPlayerInterface *iface)
dacp_player_init (DACPPlayerIface *iface)
{
static gboolean initialized = FALSE;
......@@ -50,7 +50,7 @@ dacp_player_init (DACPPlayerInterface *iface)
g_param_spec_enum ("repeat-state",
"Repeat state",
"Repeat state",
TYPE_DACP_REPEAT_STATE,
DMAP_TYPE_DACP_REPEAT_STATE,
REPEAT_NONE,
G_PARAM_READWRITE));
......@@ -58,7 +58,7 @@ dacp_player_init (DACPPlayerInterface *iface)
g_param_spec_enum ("play-state",
"Play state",
"Play state",
TYPE_DACP_PLAY_STATE,
DMAP_TYPE_DACP_PLAY_STATE,
PLAY_STOPPED,
G_PARAM_READWRITE));
......@@ -74,7 +74,7 @@ dacp_player_init (DACPPlayerInterface *iface)
}
static void
dacp_player_finalize (DACPPlayerInterface *iface)
dacp_player_finalize (DACPPlayerIface *iface)
{
}
......@@ -84,7 +84,7 @@ dacp_player_get_type (void)
static GType object_type = 0;
if (!object_type) {
static const GTypeInfo object_info = {
sizeof(DACPPlayerInterface),
sizeof(DACPPlayerIface),
(GBaseInitFunc) dacp_player_init,
(GBaseFinalizeFunc) dacp_player_finalize
};
......
......@@ -27,13 +27,13 @@
G_BEGIN_DECLS
#define TYPE_DACP_PLAYER (dacp_player_get_type ())
#define DACP_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DACP_PLAYER, DACPPlayer))
#define IS_DACP_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DACP_PLAYER))
#define DACP_TYPE_PLAYER (dacp_player_get_type ())
#define DACP_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DACP_TYPE_PLAYER, DACPPlayer))
#define IS_DACP_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DACP_TYPE_PLAYER))
#define DACP_PLAYER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), \
TYPE_DACP_PLAYER, DACPPlayerInterface))
DACP_TYPE_PLAYER, DACPPlayerIface))
typedef struct _DACPPlayerInterface DACPPlayerInterface;
typedef struct _DACPPlayerIface DACPPlayerIface;
typedef struct _DACPPlayer DACPPlayer;
/**
......@@ -54,7 +54,7 @@ typedef enum {
PLAY_PLAYING = 4
} DACPPlayState;
struct _DACPPlayerInterface
struct _DACPPlayerIface
{
GTypeInterface parent_class;
......
......@@ -100,7 +100,7 @@ typedef struct {
DMAPConnection *connection;
} DACPRemoteInfo;
#define DACP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DACP_SHARE, DACPSharePrivate))
#define DACP_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DACP_TYPE_SHARE, DACPSharePrivate))
enum {
PROP_0,
......@@ -121,7 +121,7 @@ enum {
static guint signals [LAST_SIGNAL] = { 0, };
G_DEFINE_TYPE (DACPShare, dacp_share, TYPE_DAAP_SHARE)
G_DEFINE_TYPE (DACPShare, dacp_share, DAAP_TYPE_SHARE)
static void
dacp_share_class_init (DACPShareClass *klass)
......@@ -434,7 +434,7 @@ dacp_share_new (const gchar *library_name,
g_object_ref (db);
g_object_ref (container_db);
share = DACP_SHARE (g_object_new (TYPE_DACP_SHARE,
share = DACP_SHARE (g_object_new (DACP_TYPE_SHARE,
"name", get_dbid (),
"library-name", library_name,
"password", NULL,
......
......@@ -33,11 +33,11 @@
G_BEGIN_DECLS
/**
* TYPE_DACP_SHARE:
* DACP_TYPE_SHARE:
*
* The type for #DACPShare.
*/
#define TYPE_DACP_SHARE (dacp_share_get_type ())
#define DACP_TYPE_SHARE (dacp_share_get_type ())
/**
* DACP_SHARE:
* @o: Object which is subject to casting.
......@@ -47,7 +47,7 @@ G_BEGIN_DECLS
* certain runtime checks to identify invalid casts.
*/
#define DACP_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
TYPE_DACP_SHARE, DACPShare))
DACP_TYPE_SHARE, DACPShare))
/**
* DACP_SHARE_CLASS:
* @k: a valid #DACPShareClass
......@@ -55,15 +55,15 @@ G_BEGIN_DECLS
* Casts a derived #DACPShareClass structure into a #DACPShareClass structure.
*/
#define DACP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
TYPE_DACP_SHARE, DACPShareClass))
DACP_TYPE_SHARE, DACPShareClass))
/**
* IS_DACP_SHARE:
* @o: Instance to check for being a %TYPE_DACP_SHARE.
* @o: Instance to check for being a %DACP_TYPE_SHARE.
*
* Checks whether a valid #GTypeInstance pointer is of type %TYPE_DACP_SHARE.
* Checks whether a valid #GTypeInstance pointer is of type %DACP_TYPE_SHARE.
*/
#define IS_DACP_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
TYPE_DACP_SHARE))
DACP_TYPE_SHARE))
/**
* IS_DACP_SHARE_CLASS:
* @k: a #DACPShareClass
......@@ -72,7 +72,7 @@ G_BEGIN_DECLS
* %DACP_SHARE or derived.
*/
#define IS_DACP_SHARE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
TYPE_DACP_SHARE))
DACP_TYPE_SHARE))
/**
* DACP_SHARE_GET_CLASS:
* @o: a #DACPShare instance.
......@@ -82,7 +82,7 @@ G_BEGIN_DECLS
* Returns: pointer to object class structure.
*/
#define DACP_SHARE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
TYPE_DACP_SHARE, DACPShareClass))
DACP_TYPE_SHARE, DACPShareClass))
typedef struct DACPSharePrivate DACPSharePrivate;
......
......@@ -57,7 +57,7 @@ static gboolean emit_progress_idle (DMAPConnection *connection);
G_DEFINE_TYPE (DMAPConnection, dmap_connection, G_TYPE_OBJECT)
#define DMAP_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DMAP_CONNECTION, DMAPConnectionPrivate))
#define DMAP_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_CONNECTION, DMAPConnectionPrivate))
struct DMAPConnectionPrivate {
char *name;
......@@ -1135,7 +1135,7 @@ dmap_connection_new (const char *name,
{
DMAPConnection *connection;
connection = g_object_new (TYPE_DMAP_CONNECTION,
connection = g_object_new (DMAP_TYPE_CONNECTION,
"name", name,
"password-protected", password_protected,
"db", db,
......
......@@ -38,11 +38,11 @@ typedef struct {
} DMAPPlaylist;
/**
* TYPE_DMAP_CONNECTION:
* DMAP_TYPE_CONNECTION:
*
* The type for #DMAPConnection.
*/
#define TYPE_DMAP_CONNECTION (dmap_connection_get_type ())
#define DMAP_TYPE_CONNECTION (dmap_connection_get_type ())
/**
* DMAP_CONNECTION:
* @o: Object which is subject to casting.
......@@ -51,7 +51,7 @@ typedef struct {
* Depending on the current debugging level, this function may invoke
* certain runtime checks to identify invalid casts.
*/
#define DMAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_DMAP_CONNECTION, DMAPConnection))
#define DMAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DMAP_TYPE_CONNECTION, DMAPConnection))
/**
* DMAP_CONNECTION_CLASS:
* @k: a valid #DMAPConnectionClass
......@@ -59,14 +59,14 @@ typedef struct {
* Casts a derived #DMAPConnectionClass structure into a #DMAPConnectionClass
* structure.
*/
#define DMAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_DMAP_CONNECTION, DMAPConnectionClass))
#define DMAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DMAP_TYPE_CONNECTION, DMAPConnectionClass))
/**
* IS_DMAP_CONNECTION:
* @o: Instance to check for being a %TYPE_DMAP_CONNECTION.
* @o: Instance to check for being a %DMAP_TYPE_CONNECTION.
*
* Checks whether a valid #GTypeInstance pointer is of type %TYPE_DMAP_CONNECTION.
* Checks whether a valid #GTypeInstance pointer is of type %DMAP_TYPE_CONNECTION.
*/
#define IS_DMAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_DMAP_CONNECTION))
#define IS_DMAP_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_CONNECTION))
/**
* IS_DMAP_CONNECTION_CLASS:
* @k: a #DMAPConnectionClass
......@@ -74,7 +74,7 @@ typedef struct {
* 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), TYPE_DMAP_CONNECTION))
#define IS_DMAP_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_CONNECTION))
/**
* DMAP_CONNECTION_GET_CLASS:
* @o: a #DMAPConnection instance.
......@@ -83,7 +83,7 @@ typedef struct {
*
* Returns: pointer to object class structure.
*/
#define DMAP_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_DMAP_CONNECTION, DMAPConnectionClass))
#define DMAP_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DMAP_TYPE_CONNECTION, DMAPConnectionClass))
typedef struct DMAPConnectionPrivate DMAPConnectionPrivate;
......
......@@ -23,7 +23,7 @@
static gint dmap_container_record_init_count = 0;
static void
dmap_container_record_init (DMAPContainerRecordInterface *iface)
dmap_container_record_init (DMAPContainerRecordIface *iface)
{
static gboolean is_initialized = FALSE;
......@@ -42,7 +42,7 @@ dmap_container_record_init (DMAPContainerRecordInterface *iface)
}
static void
dmap_container_record_finalize (DMAPContainerRecordInterface *iface)
dmap_container_record_finalize (DMAPContainerRecordIface *iface)
{
dmap_container_record_init_count--;
}
......@@ -54,7 +54,7 @@ dmap_container_record_get_type (void)
static GType object_type = 0;
if (!object_type) {
static const GTypeInfo object_info = {
sizeof(DMAPContainerRecordInterface),
sizeof(DMAPContainerRecordIface),
(GBaseInitFunc) dmap_container_record_init,
(GBaseFinalizeFunc) dmap_container_record_finalize
};
......
......@@ -27,11 +27,11 @@
G_BEGIN_DECLS
/**
* TYPE_DMAP_CONTAINER_RECORD:
* DMAP_TYPE_CONTAINER_RECORD:
*
* The type for #DMAPContainerRecord.
*/
#define TYPE_DMAP_CONTAINER_RECORD (dmap_container_record_get_type ())
#define DMAP_TYPE_CONTAINER_RECORD (dmap_container_record_get_type ())
/**
* DMAP_CONTAINER_RECORD:
* @o: Object which is subject to casting.
......@@ -41,16 +41,16 @@ G_BEGIN_DECLS
* certain runtime checks to identify invalid casts.
*/
#define DMAP_CONTAINER_RECORD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
TYPE_DMAP_CONTAINER_RECORD, DMAPContainerRecord))
DMAP_TYPE_CONTAINER_RECORD, DMAPContainerRecord))
/**
* IS_DMAP_CONTAINER_RECORD:
* @o: Instance to check for being a %TYPE_DMAP_CONTAINER_RECORD.
* @o: Instance to check for being a %DMAP_TYPE_CONTAINER_RECORD.
*
* Checks whether a valid #GTypeInstance pointer is of type
* %TYPE_DMAP_CONTAINER_RECORD.
* %DMAP_TYPE_CONTAINER_RECORD.
*/
#define IS_DMAP_CONTAINER_RECORD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
TYPE_DMAP_CONTAINER_RECORD))
DMAP_TYPE_CONTAINER_RECORD))
/**
* DMAP_CONTAINER_RECORD_GET_INTERFACE:
* @o: a #DMAPContainerRecord instance.
......@@ -60,12 +60,12 @@ G_BEGIN_DECLS
* Returns: pointer to object interface structure.
*/
#define DMAP_CONTAINER_RECORD_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), \
TYPE_DMAP_CONTAINER_RECORD, DMAPContainerRecordInterface))
DMAP_TYPE_CONTAINER_RECORD, DMAPContainerRecordIface))
typedef struct _DMAPContainerRecord DMAPContainerRecord;
typedef struct _DMAPContainerRecordInterface DMAPContainerRecordInterface;
typedef struct _DMAPContainerRecordIface DMAPContainerRecordIface;
struct _DMAPContainerRecordInterface {
struct _DMAPContainerRecordIface {
GTypeInterface parent;
guint (*get_id) (DMAPContainerRecord *record);
......
......@@ -103,7 +103,7 @@ static void browse_cb (AvahiServiceBrowser *service_browser,
DMAPMdnsBrowser *browser);
static void free_service (DMAPMdnsBrowserService *service);
#define DMAP_MDNS_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DMAP_MDNS_BROWSER, DMAPMdnsBrowserPrivate))
#define DMAP_MDNS_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_BROWSER, DMAPMdnsBrowserPrivate))
static guint dmap_mdns_browser_signals [LAST_SIGNAL] = { 0, };
......@@ -217,7 +217,7 @@ dmap_mdns_browser_new (DMAPMdnsBrowserServiceType type)
g_return_val_if_fail (type >= DMAP_MDNS_BROWSER_SERVICE_TYPE_INVALID &&
type <= DMAP_MDNS_BROWSER_SERVICE_TYPE_LAST, NULL);
browser_object = DMAP_MDNS_BROWSER (g_object_new (TYPE_DMAP_MDNS_BROWSER, NULL));
browser_object = DMAP_MDNS_BROWSER (g_object_new (DMAP_TYPE_MDNS_BROWSER, NULL));
browser_object->priv->service_type = type;
return browser_object;
......
......@@ -78,7 +78,7 @@ static void dmap_mdns_browser_finalize (GObject *object);
static void free_service (DMAPMdnsBrowserService *service);
#define DMAP_MDNS_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DMAP_MDNS_BROWSER, DMAPMdnsBrowserPrivate))
#define DMAP_MDNS_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_BROWSER, DMAPMdnsBrowserPrivate))
static guint signals [LAST_SIGNAL] = { 0, };
......@@ -343,7 +343,7 @@ dmap_mdns_browser_new (DMAPMdnsBrowserServiceType type)
g_return_val_if_fail (type >= DMAP_MDNS_BROWSER_SERVICE_TYPE_INVALID &&
type <= DMAP_MDNS_BROWSER_SERVICE_TYPE_LAST, NULL);
browser_object = DMAP_MDNS_BROWSER (g_object_new (TYPE_DMAP_MDNS_BROWSER, NULL));
browser_object = DMAP_MDNS_BROWSER (g_object_new (DMAP_TYPE_MDNS_BROWSER, NULL));
browser_object->priv->service_type = type;
return browser_object;
......
......@@ -28,11 +28,11 @@
G_BEGIN_DECLS
/**
* TYPE_DMAP_MDNS_BROWSER:
* DMAP_TYPE_MDNS_BROWSER:
*
* The type for #DMAPMdnsBrowser.
*/
#define TYPE_DMAP_MDNS_BROWSER (dmap_mdns_browser_get_type ())
#define DMAP_TYPE_MDNS_BROWSER (dmap_mdns_browser_get_type ())
/**
* DMAP_MDNS_BROWSER:
* @o: Object which is subject to casting.
......@@ -41,21 +41,21 @@ G_BEGIN_DECLS
* Depending on the current debugging level, this function may invoke
* certain runtime checks to identify invalid casts.
*/
#define DMAP_MDNS_BROWSER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_DMAP_MDNS_BROWSER, DMAPMdnsBrowser))
#define DMAP_MDNS_BROWSER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DMAP_TYPE_MDNS_BROWSER, DMAPMdnsBrowser))
/**
* DMAP_MDNS_BROWSER_CLASS:
* @k: a valid #DMAPMdnsBrowserClass
*
* Casts a derived #DAAPShareClass structure into a #DAAPShareClass structure.
*/
#define DMAP_MDNS_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_DMAP_MDNS_BROWSER, DMAPMdnsBrowserClass))
#define DMAP_MDNS_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DMAP_TYPE_MDNS_BROWSER, DMAPMdnsBrowserClass))
/**
* IS_DMAP_MDNS_BROWSER:
* @o: Instance to check for being a %TYPE_DMAP_MDNS_BROWSER.
* @o: Instance to check for being a %DMAP_TYPE_MDNS_BROWSER.
*
* Checks whether a valid #GTypeInstance pointer is of type %TYPE_DAAP_SHARE.
* Checks whether a valid #GTypeInstance pointer is of type %DAAP_TYPE_SHARE.
*/
#define IS_DMAP_MDNS_BROWSER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_DMAP_MDNS_BROWSER))
#define IS_DMAP_MDNS_BROWSER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DMAP_TYPE_MDNS_BROWSER))
/**
* IS_DMAP_MDNS_BROWSER_CLASS:
* @k: a #DMAPMdnsBrowserClass
......@@ -63,7 +63,7 @@ G_BEGIN_DECLS
* 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), TYPE_DMAP_MDNS_BROWSER))
#define IS_DMAP_MDNS_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DMAP_TYPE_MDNS_BROWSER))
/**
* DMAP_MDNS_BROWSER_GET_CLASS:
* @o: a #DMAPMdnsBrowser instance.
......@@ -72,7 +72,7 @@ G_BEGIN_DECLS
*
* Returns: pointer to object class structure.
*/
#define DMAP_MDNS_BROWSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_DMAP_MDNS_BROWSER, DMAPMdnsBrowserClass))
#define DMAP_MDNS_BROWSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DMAP_TYPE_MDNS_BROWSER, DMAPMdnsBrowserClass))
typedef struct _DMAPMdnsBrowser DMAPMdnsBrowser;
typedef struct _DMAPMdnsBrowserClass DMAPMdnsBrowserClass;
......
......@@ -44,7 +44,7 @@ static void dmap_mdns_publisher_class_init (DMAPMdnsPublisherClass *klass);
static void dmap_mdns_publisher_init (DMAPMdnsPublisher *publisher);
static void dmap_mdns_publisher_finalize (GObject *object);
#define DMAP_MDNS_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DMAP_MDNS_PUBLISHER, DMAPMdnsPublisherPrivate))
#define DMAP_MDNS_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_PUBLISHER, DMAPMdnsPublisherPrivate))
struct DMAPMdnsPublisherService
{
......@@ -474,7 +474,7 @@ dmap_mdns_publisher_new (void)
if (publisher_object) {
g_object_ref (publisher_object);
} else {
publisher_object = g_object_new (TYPE_DMAP_MDNS_PUBLISHER, NULL);
publisher_object = g_object_new (DMAP_TYPE_MDNS_PUBLISHER, NULL);
g_object_add_weak_pointer (publisher_object,
(gpointer *) &publisher_object);
}
......
......@@ -25,7 +25,7 @@
#include "dmap-mdns-publisher.h"
#define DMAP_MDNS_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DMAP_MDNS_PUBLISHER, DMAPMdnsPublisherPrivate))
#define DMAP_MDNS_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_PUBLISHER, DMAPMdnsPublisherPrivate))
struct DMAPMdnsPublisherPrivate
{
......@@ -207,7 +207,7 @@ dmap_mdns_publisher_new (void)
if (publisher_object) {
g_object_ref (publisher_object);
} else {
publisher_object = g_object_new (TYPE_DMAP_MDNS_PUBLISHER, NULL);
publisher_object = g_object_new (DMAP_TYPE_MDNS_PUBLISHER, NULL);
g_object_add_weak_pointer (publisher_object,
(gpointer *) &publisher_object);
}
......
......@@ -31,12 +31,12 @@
G_BEGIN_DECLS
#define TYPE_DMAP_MDNS_PUBLISHER (dmap_mdns_publisher_get_type ())
#define DMAP_MDNS_PUBLISHER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_DMAP_MDNS_PUBLISHER, DMAPMdnsPublisher))
#define DMAP_MDNS_PUBLISHER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_DMAP_MDNS_PUBLISHER, DMAPMdnsPublisherClass))
#define IS_DMAP_MDNS_PUBLISHER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_DMAP_MDNS_PUBLISHER))