[libdmapsharing/LIBDMAPSHARING_3_0] Small changes to fix Vala build
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing/LIBDMAPSHARING_3_0] Small changes to fix Vala build
- Date: Tue, 30 Jun 2020 20:44:36 +0000 (UTC)
commit 9aaed0a037ee6a6f4f7536fd8dbdf1fa846cd450
Author: W. Michael Petullo <mike flyn org>
Date: Tue Jun 30 14:19:15 2020 -0400
Small changes to fix Vala build
libdmapsharing/test-daap-record-factory.c | 2 +-
libdmapsharing/test-daap-record-factory.h | 2 -
libdmapsharing/test-daap-record.c | 3 +-
libdmapsharing/test-daap-record.h | 2 -
libdmapsharing/test-dpap-record-factory.c | 2 +-
libdmapsharing/test-dpap-record-factory.h | 2 -
libdmapsharing/test-dpap-record.c | 3 +-
libdmapsharing/test-dpap-record.h | 3 -
tests/dacplisten.c | 324 +++++++++------
tests/dmapcopy.c | 406 ++++++++++++-------
tests/dmapserve.c | 274 ++++++++-----
tests/dpapview.c | 572 ++++++++++++++------------
tests/test-dmap-client.c | 4 +-
tests/test-dmap-server.c | 8 +-
tests/vala-dmap-container-db.c | 181 +++++----
tests/vala-dmap-container-db.vala | 2 +-
tests/vala-dmap-db.c | 250 +++++++-----
tests/vala-dmap-db.vala | 2 +-
tests/vala-dpap-record.c | 652 +++++++++++++++++-------------
vala/libdmapsharing-3.0.vapi | 162 +++++---
20 files changed, 1664 insertions(+), 1192 deletions(-)
---
diff --git a/libdmapsharing/test-daap-record-factory.c b/libdmapsharing/test-daap-record-factory.c
index c2f03ed..afe47e6 100644
--- a/libdmapsharing/test-daap-record-factory.c
+++ b/libdmapsharing/test-daap-record-factory.c
@@ -21,7 +21,7 @@
#include "test-daap-record-factory.h"
#include "test-daap-record.h"
-DMAPRecord *
+static DMAPRecord *
test_daap_record_factory_create (DMAPRecordFactory *factory, gpointer user_data)
{
return DMAP_RECORD (test_daap_record_new ());
diff --git a/libdmapsharing/test-daap-record-factory.h b/libdmapsharing/test-daap-record-factory.h
index 6c3146e..fc8fe7f 100644
--- a/libdmapsharing/test-daap-record-factory.h
+++ b/libdmapsharing/test-daap-record-factory.h
@@ -51,8 +51,6 @@ GType test_daap_record_factory_get_type (void);
TestDAAPRecordFactory *test_daap_record_factory_new (void);
-DMAPRecord *test_daap_record_factory_create (DMAPRecordFactory *factory, gpointer user_data);
-
#endif /* __TEST_DAAP_RECORD_FACTORY */
G_END_DECLS
diff --git a/libdmapsharing/test-daap-record.c b/libdmapsharing/test-daap-record.c
index 67ade69..4346d99 100644
--- a/libdmapsharing/test-daap-record.c
+++ b/libdmapsharing/test-daap-record.c
@@ -217,7 +217,8 @@ test_daap_record_get_property (GObject *object,
}
}
-GInputStream *test_daap_record_read (DAAPRecord *record, GError **error)
+static GInputStream *
+test_daap_record_read (DAAPRecord *record, GError **error)
{
GFile *file;
GInputStream *stream;
diff --git a/libdmapsharing/test-daap-record.h b/libdmapsharing/test-daap-record.h
index 5baf956..1d76797 100644
--- a/libdmapsharing/test-daap-record.h
+++ b/libdmapsharing/test-daap-record.h
@@ -57,8 +57,6 @@ GType test_daap_record_get_type (void);
TestDAAPRecord *test_daap_record_new (void);
-GInputStream *test_daap_record_read (DAAPRecord *record, GError **err);
-
#endif /* __TEST_DAAP_RECORD */
G_END_DECLS
diff --git a/libdmapsharing/test-dpap-record-factory.c b/libdmapsharing/test-dpap-record-factory.c
index 66e03cb..c0c3d1b 100644
--- a/libdmapsharing/test-dpap-record-factory.c
+++ b/libdmapsharing/test-dpap-record-factory.c
@@ -21,7 +21,7 @@
#include "test-dpap-record-factory.h"
#include "test-dpap-record.h"
-DMAPRecord *
+static DMAPRecord *
test_dpap_record_factory_create (DMAPRecordFactory *factory, gpointer user_data)
{
return DMAP_RECORD (test_dpap_record_new ());
diff --git a/libdmapsharing/test-dpap-record-factory.h b/libdmapsharing/test-dpap-record-factory.h
index c8671c7..eeca4ec 100644
--- a/libdmapsharing/test-dpap-record-factory.h
+++ b/libdmapsharing/test-dpap-record-factory.h
@@ -51,8 +51,6 @@ GType test_dpap_record_factory_get_type (void);
TestDPAPRecordFactory *test_dpap_record_factory_new (void);
-DMAPRecord *test_dpap_record_factory_create (DMAPRecordFactory *factory, gpointer user_data);
-
#endif /* __TEST_DPAP_RECORD_FACTORY */
G_END_DECLS
diff --git a/libdmapsharing/test-dpap-record.c b/libdmapsharing/test-dpap-record.c
index fbe7000..e2503a7 100644
--- a/libdmapsharing/test-dpap-record.c
+++ b/libdmapsharing/test-dpap-record.c
@@ -144,7 +144,8 @@ test_dpap_record_get_property (GObject *object,
}
}
-GInputStream *test_dpap_record_read (DPAPRecord *record, GError **error)
+static GInputStream *
+test_dpap_record_read (DPAPRecord *record, GError **error)
{
GFile *file;
GInputStream *stream;
diff --git a/libdmapsharing/test-dpap-record.h b/libdmapsharing/test-dpap-record.h
index f90c4a1..b439cb5 100644
--- a/libdmapsharing/test-dpap-record.h
+++ b/libdmapsharing/test-dpap-record.h
@@ -57,9 +57,6 @@ GType test_dpap_record_get_type (void);
TestDPAPRecord *test_dpap_record_new (void);
-GInputStream *test_dpap_record_read (DPAPRecord *record,
- GError **err);
-
#endif /* __TEST_DPAP_RECORD */
G_END_DECLS
diff --git a/tests/dacplisten.c b/tests/dacplisten.c
index ac7c401..833d2e7 100644
--- a/tests/dacplisten.c
+++ b/tests/dacplisten.c
@@ -1,4 +1,4 @@
-/* dacplisten.c generated by valac 0.27.2, the Vala compiler
+/* dacplisten.c generated by valac 0.48.6, the Vala compiler
* generated from dacplisten.vala, do not modify */
/* FILE: dacplisten.vala -- Listen to DACP remotes
@@ -23,14 +23,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <glib.h>
#include <glib-object.h>
#include <libdmapsharing/dmap.h>
#include <stdio.h>
+#include <glib.h>
#include <stdlib.h>
#include <string.h>
-
#define TYPE_VALA_DACP_PLAYER (vala_dacp_player_get_type ())
#define VALA_DACP_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VALA_DACP_PLAYER, ValaDACPPlayer))
#define VALA_DACP_PLAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VALA_DACP_PLAYER,
ValaDACPPlayerClass))
@@ -41,6 +40,11 @@
typedef struct _ValaDACPPlayer ValaDACPPlayer;
typedef struct _ValaDACPPlayerClass ValaDACPPlayerClass;
typedef struct _ValaDACPPlayerPrivate ValaDACPPlayerPrivate;
+enum {
+ VALA_DACP_PLAYER_0_PROPERTY,
+ VALA_DACP_PLAYER_NUM_PROPERTIES
+};
+static GParamSpec* vala_dacp_player_properties[VALA_DACP_PLAYER_NUM_PROPERTIES];
#define TYPE_DACP_LISTENER (dacp_listener_get_type ())
#define DACP_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DACP_LISTENER, DACPListener))
@@ -52,6 +56,11 @@ typedef struct _ValaDACPPlayerPrivate ValaDACPPlayerPrivate;
typedef struct _DACPListener DACPListener;
typedef struct _DACPListenerClass DACPListenerClass;
typedef struct _DACPListenerPrivate DACPListenerPrivate;
+enum {
+ DACP_LISTENER_0_PROPERTY,
+ DACP_LISTENER_NUM_PROPERTIES
+};
+static GParamSpec* dacp_listener_properties[DACP_LISTENER_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define TYPE_VALA_DMAP_DB (vala_dmap_db_get_type ())
@@ -100,50 +109,64 @@ struct _DACPListenerPrivate {
DACPShare* share;
};
-
static gpointer vala_dacp_player_parent_class = NULL;
-static DACPPlayerIface* vala_dacp_player_dacp_player_parent_iface = NULL;
+static DACPPlayerIface * vala_dacp_player_dacp_player_parent_iface = NULL;
+static gint DACPListener_private_offset;
static gpointer dacp_listener_parent_class = NULL;
GType vala_dacp_player_get_type (void) G_GNUC_CONST;
-enum {
- VALA_DACP_PLAYER_DUMMY_PROPERTY
-};
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDACPPlayer, g_object_unref)
static DAAPRecord* vala_dacp_player_real_now_playing_record (DACPPlayer* base);
-static guchar* vala_dacp_player_real_now_playing_artwork (DACPPlayer* base, guint width, guint height, int*
result_length1);
+static guchar* vala_dacp_player_real_now_playing_artwork (DACPPlayer* base,
+ guint width,
+ guint height,
+ gint* result_length1);
static void vala_dacp_player_real_play_pause (DACPPlayer* base);
static void vala_dacp_player_real_pause (DACPPlayer* base);
static void vala_dacp_player_real_next_item (DACPPlayer* base);
static void vala_dacp_player_real_prev_item (DACPPlayer* base);
static void vala_dacp_player_real_cue_clear (DACPPlayer* base);
-static void vala_dacp_player_real_cue_play (DACPPlayer* base, GList* records, guint index);
+static void vala_dacp_player_real_cue_play (DACPPlayer* base,
+ GList* records,
+ guint index);
ValaDACPPlayer* vala_dacp_player_new (void);
ValaDACPPlayer* vala_dacp_player_construct (GType object_type);
+static GType vala_dacp_player_get_type_once (void);
GType dacp_listener_get_type (void) G_GNUC_CONST;
-#define DACP_LISTENER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DACP_LISTENER,
DACPListenerPrivate))
-enum {
- DACP_LISTENER_DUMMY_PROPERTY
-};
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (DACPListener, g_object_unref)
DACPListener* dacp_listener_new (void);
DACPListener* dacp_listener_construct (GType object_type);
ValaDMAPDb* vala_dmap_db_new (void);
ValaDMAPDb* vala_dmap_db_construct (GType object_type);
GType vala_dmap_db_get_type (void) G_GNUC_CONST;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDMAPDb, g_object_unref)
ValaDMAPContainerDb* vala_dmap_container_db_new (void);
ValaDMAPContainerDb* vala_dmap_container_db_construct (GType object_type);
GType vala_dmap_container_db_get_type (void) G_GNUC_CONST;
-static void __lambda4_ (DACPListener* self, const gchar* service_name, const gchar* display_name);
-static void ___lambda4__dacp_share_remote_found (DACPShare* _sender, const gchar* service_name, const gchar*
remote_name, gpointer self);
-static void __lambda5_ (DACPListener* self, const gchar* guid);
-static void ___lambda5__dacp_share_add_guid (DACPShare* _sender, const gchar* guid, gpointer self);
-static void dacp_listener_finalize (GObject* obj);
-gint _vala_main (gchar** args, int args_length1);
-
-
-static DAAPRecord* vala_dacp_player_real_now_playing_record (DACPPlayer* base) {
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDMAPContainerDb, g_object_unref)
+static void __lambda4_ (DACPListener* self,
+ const gchar* service_name,
+ const gchar* display_name);
+static void ___lambda4__dacp_share_remote_found (DACPShare* _sender,
+ const gchar* service_name,
+ const gchar* remote_name,
+ gpointer self);
+static void __lambda5_ (DACPListener* self,
+ const gchar* guid);
+static void ___lambda5__dacp_share_add_guid (DACPShare* _sender,
+ const gchar* guid,
+ gpointer self);
+static void dacp_listener_finalize (GObject * obj);
+static GType dacp_listener_get_type_once (void);
+gint _vala_main (gchar** args,
+ gint args_length1);
+
+static DAAPRecord*
+vala_dacp_player_real_now_playing_record (DACPPlayer* base)
+{
ValaDACPPlayer * self;
+ FILE* _tmp0_;
DAAPRecord* result = NULL;
- FILE* _tmp0_ = NULL;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Now playing record request received\n");
@@ -151,13 +174,17 @@ static DAAPRecord* vala_dacp_player_real_now_playing_record (DACPPlayer* base) {
return result;
}
-
-static guchar* vala_dacp_player_real_now_playing_artwork (DACPPlayer* base, guint width, guint height, int*
result_length1) {
+static guchar*
+vala_dacp_player_real_now_playing_artwork (DACPPlayer* base,
+ guint width,
+ guint height,
+ gint* result_length1)
+{
ValaDACPPlayer * self;
+ FILE* _tmp0_;
+ guchar* _tmp1_;
+ gint _tmp1__length1;
guchar* result = NULL;
- FILE* _tmp0_ = NULL;
- guchar* _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Now playing artwork request received\n");
@@ -170,152 +197,192 @@ static guchar* vala_dacp_player_real_now_playing_artwork (DACPPlayer* base, guin
return result;
}
-
-static void vala_dacp_player_real_play_pause (DACPPlayer* base) {
+static void
+vala_dacp_player_real_play_pause (DACPPlayer* base)
+{
ValaDACPPlayer * self;
- FILE* _tmp0_ = NULL;
+ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Play/pause request received\n");
}
-
-static void vala_dacp_player_real_pause (DACPPlayer* base) {
+static void
+vala_dacp_player_real_pause (DACPPlayer* base)
+{
ValaDACPPlayer * self;
- FILE* _tmp0_ = NULL;
+ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Pause request received\n");
}
-
-static void vala_dacp_player_real_next_item (DACPPlayer* base) {
+static void
+vala_dacp_player_real_next_item (DACPPlayer* base)
+{
ValaDACPPlayer * self;
- FILE* _tmp0_ = NULL;
+ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Next item request received\n");
}
-
-static void vala_dacp_player_real_prev_item (DACPPlayer* base) {
+static void
+vala_dacp_player_real_prev_item (DACPPlayer* base)
+{
ValaDACPPlayer * self;
- FILE* _tmp0_ = NULL;
+ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Previous item request received\n");
}
-
-static void vala_dacp_player_real_cue_clear (DACPPlayer* base) {
+static void
+vala_dacp_player_real_cue_clear (DACPPlayer* base)
+{
ValaDACPPlayer * self;
- FILE* _tmp0_ = NULL;
+ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Cue clear request received\n");
}
-
-static void vala_dacp_player_real_cue_play (DACPPlayer* base, GList* records, guint index) {
+static void
+vala_dacp_player_real_cue_play (DACPPlayer* base,
+ GList* records,
+ guint index)
+{
ValaDACPPlayer * self;
- FILE* _tmp0_ = NULL;
+ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Cue play request received\n");
}
-
-ValaDACPPlayer* vala_dacp_player_construct (GType object_type) {
+ValaDACPPlayer*
+vala_dacp_player_construct (GType object_type)
+{
ValaDACPPlayer * self = NULL;
self = (ValaDACPPlayer*) g_object_new (object_type, NULL);
return self;
}
-
-ValaDACPPlayer* vala_dacp_player_new (void) {
+ValaDACPPlayer*
+vala_dacp_player_new (void)
+{
return vala_dacp_player_construct (TYPE_VALA_DACP_PLAYER);
}
-
-static void vala_dacp_player_class_init (ValaDACPPlayerClass * klass) {
+static void
+vala_dacp_player_class_init (ValaDACPPlayerClass * klass,
+ gpointer klass_data)
+{
vala_dacp_player_parent_class = g_type_class_peek_parent (klass);
}
-
-static void vala_dacp_player_dacp_player_interface_init (DACPPlayerIface * iface) {
+static void
+vala_dacp_player_dacp_player_interface_init (DACPPlayerIface * iface,
+ gpointer iface_data)
+{
vala_dacp_player_dacp_player_parent_iface = g_type_interface_peek_parent (iface);
- iface->now_playing_record = (DAAPRecord* (*)(DACPPlayer*)) vala_dacp_player_real_now_playing_record;
- iface->now_playing_artwork = (guchar* (*)(DACPPlayer*, guint, guint, int*))
vala_dacp_player_real_now_playing_artwork;
- iface->play_pause = (void (*)(DACPPlayer*)) vala_dacp_player_real_play_pause;
- iface->pause = (void (*)(DACPPlayer*)) vala_dacp_player_real_pause;
- iface->next_item = (void (*)(DACPPlayer*)) vala_dacp_player_real_next_item;
- iface->prev_item = (void (*)(DACPPlayer*)) vala_dacp_player_real_prev_item;
- iface->cue_clear = (void (*)(DACPPlayer*)) vala_dacp_player_real_cue_clear;
- iface->cue_play = (void (*)(DACPPlayer*, GList*, guint)) vala_dacp_player_real_cue_play;
+ iface->now_playing_record = (DAAPRecord* (*) (DACPPlayer*)) vala_dacp_player_real_now_playing_record;
+ iface->now_playing_artwork = (guchar* (*) (DACPPlayer*, guint, guint, gint*))
vala_dacp_player_real_now_playing_artwork;
+ iface->play_pause = (void (*) (DACPPlayer*)) vala_dacp_player_real_play_pause;
+ iface->pause = (void (*) (DACPPlayer*)) vala_dacp_player_real_pause;
+ iface->next_item = (void (*) (DACPPlayer*)) vala_dacp_player_real_next_item;
+ iface->prev_item = (void (*) (DACPPlayer*)) vala_dacp_player_real_prev_item;
+ iface->cue_clear = (void (*) (DACPPlayer*)) vala_dacp_player_real_cue_clear;
+ iface->cue_play = (void (*) (DACPPlayer*, GList*, guint)) vala_dacp_player_real_cue_play;
}
-
-static void vala_dacp_player_instance_init (ValaDACPPlayer * self) {
+static void
+vala_dacp_player_instance_init (ValaDACPPlayer * self,
+ gpointer klass)
+{
}
+static GType
+vala_dacp_player_get_type_once (void)
+{
+ static const GTypeInfo g_define_type_info = { sizeof (ValaDACPPlayerClass), (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GClassInitFunc) vala_dacp_player_class_init, (GClassFinalizeFunc) NULL, NULL,
sizeof (ValaDACPPlayer), 0, (GInstanceInitFunc) vala_dacp_player_instance_init, NULL };
+ static const GInterfaceInfo dacp_player_info = { (GInterfaceInitFunc)
vala_dacp_player_dacp_player_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+ GType vala_dacp_player_type_id;
+ vala_dacp_player_type_id = g_type_register_static (G_TYPE_OBJECT, "ValaDACPPlayer",
&g_define_type_info, 0);
+ g_type_add_interface_static (vala_dacp_player_type_id, DACP_TYPE_PLAYER, &dacp_player_info);
+ return vala_dacp_player_type_id;
+}
-GType vala_dacp_player_get_type (void) {
+GType
+vala_dacp_player_get_type (void)
+{
static volatile gsize vala_dacp_player_type_id__volatile = 0;
if (g_once_init_enter (&vala_dacp_player_type_id__volatile)) {
- static const GTypeInfo g_define_type_info = { sizeof (ValaDACPPlayerClass), (GBaseInitFunc)
NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) vala_dacp_player_class_init, (GClassFinalizeFunc) NULL,
NULL, sizeof (ValaDACPPlayer), 0, (GInstanceInitFunc) vala_dacp_player_instance_init, NULL };
- static const GInterfaceInfo dacp_player_info = { (GInterfaceInitFunc)
vala_dacp_player_dacp_player_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
GType vala_dacp_player_type_id;
- vala_dacp_player_type_id = g_type_register_static (G_TYPE_OBJECT, "ValaDACPPlayer",
&g_define_type_info, 0);
- g_type_add_interface_static (vala_dacp_player_type_id, DACP_TYPE_PLAYER, &dacp_player_info);
+ vala_dacp_player_type_id = vala_dacp_player_get_type_once ();
g_once_init_leave (&vala_dacp_player_type_id__volatile, vala_dacp_player_type_id);
}
return vala_dacp_player_type_id__volatile;
}
+static inline gpointer
+dacp_listener_get_instance_private (DACPListener* self)
+{
+ return G_STRUCT_MEMBER_P (self, DACPListener_private_offset);
+}
-static void __lambda4_ (DACPListener* self, const gchar* service_name, const gchar* display_name) {
- FILE* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+static void
+__lambda4_ (DACPListener* self,
+ const gchar* service_name,
+ const gchar* display_name)
+{
+ FILE* _tmp0_;
g_return_if_fail (service_name != NULL);
g_return_if_fail (display_name != NULL);
_tmp0_ = stdout;
- _tmp1_ = service_name;
- _tmp2_ = display_name;
- fprintf (_tmp0_, "Found remote: %s, %s\n", _tmp1_, _tmp2_);
+ fprintf (_tmp0_, "Found remote: %s, %s\n", service_name, display_name);
}
-
-static void ___lambda4__dacp_share_remote_found (DACPShare* _sender, const gchar* service_name, const gchar*
remote_name, gpointer self) {
+static void
+___lambda4__dacp_share_remote_found (DACPShare* _sender,
+ const gchar* service_name,
+ const gchar* remote_name,
+ gpointer self)
+{
__lambda4_ ((DACPListener*) self, service_name, remote_name);
}
-
-static void __lambda5_ (DACPListener* self, const gchar* guid) {
- FILE* _tmp0_ = NULL;
+static void
+__lambda5_ (DACPListener* self,
+ const gchar* guid)
+{
+ FILE* _tmp0_;
g_return_if_fail (guid != NULL);
_tmp0_ = stdout;
fprintf (_tmp0_, "Add GUID request received\n");
}
-
-static void ___lambda5__dacp_share_add_guid (DACPShare* _sender, const gchar* guid, gpointer self) {
+static void
+___lambda5__dacp_share_add_guid (DACPShare* _sender,
+ const gchar* guid,
+ gpointer self)
+{
__lambda5_ ((DACPListener*) self, guid);
}
-
-DACPListener* dacp_listener_construct (GType object_type) {
+DACPListener*
+dacp_listener_construct (GType object_type)
+{
DACPListener * self = NULL;
- ValaDMAPDb* _tmp0_ = NULL;
- ValaDMAPContainerDb* _tmp1_ = NULL;
- ValaDACPPlayer* _tmp2_ = NULL;
- DACPPlayer* _tmp3_ = NULL;
- DMAPDb* _tmp4_ = NULL;
- DMAPContainerDb* _tmp5_ = NULL;
- DACPShare* _tmp6_ = NULL;
- DACPShare* _tmp7_ = NULL;
- DACPShare* _tmp8_ = NULL;
- DACPShare* _tmp9_ = NULL;
+ ValaDMAPDb* _tmp0_;
+ ValaDMAPContainerDb* _tmp1_;
+ ValaDACPPlayer* _tmp2_;
+ DACPPlayer* _tmp3_;
+ DMAPDb* _tmp4_;
+ DMAPContainerDb* _tmp5_;
+ DACPShare* _tmp6_;
+ DACPShare* _tmp7_;
+ DACPShare* _tmp8_;
+ DACPShare* _tmp9_;
self = (DACPListener*) g_object_new (object_type, NULL);
_tmp0_ = vala_dmap_db_new ();
_g_object_unref0 (self->priv->db);
@@ -341,25 +408,31 @@ DACPListener* dacp_listener_construct (GType object_type) {
return self;
}
-
-DACPListener* dacp_listener_new (void) {
+DACPListener*
+dacp_listener_new (void)
+{
return dacp_listener_construct (TYPE_DACP_LISTENER);
}
-
-static void dacp_listener_class_init (DACPListenerClass * klass) {
+static void
+dacp_listener_class_init (DACPListenerClass * klass,
+ gpointer klass_data)
+{
dacp_listener_parent_class = g_type_class_peek_parent (klass);
- g_type_class_add_private (klass, sizeof (DACPListenerPrivate));
+ g_type_class_adjust_private_offset (klass, &DACPListener_private_offset);
G_OBJECT_CLASS (klass)->finalize = dacp_listener_finalize;
}
-
-static void dacp_listener_instance_init (DACPListener * self) {
- self->priv = DACP_LISTENER_GET_PRIVATE (self);
+static void
+dacp_listener_instance_init (DACPListener * self,
+ gpointer klass)
+{
+ self->priv = dacp_listener_get_instance_private (self);
}
-
-static void dacp_listener_finalize (GObject* obj) {
+static void
+dacp_listener_finalize (GObject * obj)
+{
DACPListener * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DACP_LISTENER, DACPListener);
_g_object_unref0 (self->priv->db);
@@ -369,25 +442,37 @@ static void dacp_listener_finalize (GObject* obj) {
G_OBJECT_CLASS (dacp_listener_parent_class)->finalize (obj);
}
+static GType
+dacp_listener_get_type_once (void)
+{
+ static const GTypeInfo g_define_type_info = { sizeof (DACPListenerClass), (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GClassInitFunc) dacp_listener_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof
(DACPListener), 0, (GInstanceInitFunc) dacp_listener_instance_init, NULL };
+ GType dacp_listener_type_id;
+ dacp_listener_type_id = g_type_register_static (G_TYPE_OBJECT, "DACPListener", &g_define_type_info,
0);
+ DACPListener_private_offset = g_type_add_instance_private (dacp_listener_type_id, sizeof
(DACPListenerPrivate));
+ return dacp_listener_type_id;
+}
-GType dacp_listener_get_type (void) {
+GType
+dacp_listener_get_type (void)
+{
static volatile gsize dacp_listener_type_id__volatile = 0;
if (g_once_init_enter (&dacp_listener_type_id__volatile)) {
- static const GTypeInfo g_define_type_info = { sizeof (DACPListenerClass), (GBaseInitFunc)
NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) dacp_listener_class_init, (GClassFinalizeFunc) NULL, NULL,
sizeof (DACPListener), 0, (GInstanceInitFunc) dacp_listener_instance_init, NULL };
GType dacp_listener_type_id;
- dacp_listener_type_id = g_type_register_static (G_TYPE_OBJECT, "DACPListener",
&g_define_type_info, 0);
+ dacp_listener_type_id = dacp_listener_get_type_once ();
g_once_init_leave (&dacp_listener_type_id__volatile, dacp_listener_type_id);
}
return dacp_listener_type_id__volatile;
}
-
-gint _vala_main (gchar** args, int args_length1) {
- gint result = 0;
+gint
+_vala_main (gchar** args,
+ gint args_length1)
+{
GMainLoop* loop = NULL;
- GMainLoop* _tmp0_ = NULL;
+ GMainLoop* _tmp0_;
DACPListener* dacplistener = NULL;
- DACPListener* _tmp1_ = NULL;
+ DACPListener* _tmp1_;
+ gint result = 0;
_tmp0_ = g_main_loop_new (NULL, FALSE);
loop = _tmp0_;
_tmp1_ = dacp_listener_new ();
@@ -399,13 +484,10 @@ gint _vala_main (gchar** args, int args_length1) {
return result;
}
-
-int main (int argc, char ** argv) {
-#if !GLIB_CHECK_VERSION (2,35,0)
- g_type_init ();
-#endif
+int
+main (int argc,
+ char ** argv)
+{
return _vala_main (argv, argc);
}
-
-
diff --git a/tests/dmapcopy.c b/tests/dmapcopy.c
index 58baa1d..ceb1c7f 100644
--- a/tests/dmapcopy.c
+++ b/tests/dmapcopy.c
@@ -1,4 +1,4 @@
-/* dmapcopy.c generated by valac 0.27.2, the Vala compiler
+/* dmapcopy.c generated by valac 0.48.6, the Vala compiler
* generated from dmapcopy.vala, do not modify */
/* FILE: dmapcopy.vala -- Copy files from a DMAP server
@@ -23,15 +23,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <glib.h>
#include <glib-object.h>
#include <libdmapsharing/dmap.h>
+#include <glib.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <gobject/gvaluecollector.h>
-
#define TYPE_DPAP_COPY (dpap_copy_get_type ())
#define DPAP_COPY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DPAP_COPY, DPAPCopy))
#define DPAP_COPY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DPAP_COPY, DPAPCopyClass))
@@ -99,126 +98,170 @@ struct _ParamSpecDPAPCopy {
GParamSpec parent_instance;
};
-
+static gint DPAPCopy_private_offset;
static gpointer dpap_copy_parent_class = NULL;
gpointer dpap_copy_ref (gpointer instance);
void dpap_copy_unref (gpointer instance);
-GParamSpec* param_spec_dpap_copy (const gchar* name, const gchar* nick, const gchar* blurb, GType
object_type, GParamFlags flags);
-void value_set_dpap_copy (GValue* value, gpointer v_object);
-void value_take_dpap_copy (GValue* value, gpointer v_object);
+GParamSpec* param_spec_dpap_copy (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_dpap_copy (GValue* value,
+ gpointer v_object);
+void value_take_dpap_copy (GValue* value,
+ gpointer v_object);
gpointer value_get_dpap_copy (const GValue* value);
GType dpap_copy_get_type (void) G_GNUC_CONST;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (DPAPCopy, dpap_copy_unref)
GType vala_dmap_db_get_type (void) G_GNUC_CONST;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDMAPDb, g_object_unref)
GType vala_dpap_record_factory_get_type (void) G_GNUC_CONST;
-#define DPAP_COPY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DPAP_COPY, DPAPCopyPrivate))
-enum {
- DPAP_COPY_DUMMY_PROPERTY
-};
-static gboolean dpap_copy_connected_cb (DPAPCopy* self, DMAPConnection* connection, gboolean _result_, const
gchar* reason);
-static void __lambda4_ (DPAPCopy* self, gconstpointer k, gconstpointer v);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDPAPRecordFactory, g_object_unref)
+static gboolean dpap_copy_connected_cb (DPAPCopy* self,
+ DMAPConnection* connection,
+ gboolean _result_,
+ const gchar* reason);
+static void __lambda4_ (DPAPCopy* self,
+ gconstpointer k,
+ gconstpointer v);
GType vala_dpap_record_get_type (void) G_GNUC_CONST;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDPAPRecord, g_object_unref)
const gchar* vala_dpap_record_get_location (ValaDPAPRecord* self);
-static void ___lambda4__gh_func (gconstpointer key, gconstpointer value, gpointer self);
-static void dpap_copy_service_added_cb (DPAPCopy* self, DMAPMdnsBrowserService* service);
-static gboolean _dpap_copy_connected_cb_dmap_connection_callback (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self);
+static void ___lambda4__gh_func (gconstpointer key,
+ gconstpointer value,
+ gpointer self);
+static void dpap_copy_service_added_cb (DPAPCopy* self,
+ DMAPMdnsBrowserService* service);
+static gboolean _dpap_copy_connected_cb_dmap_connection_callback (DMAPConnection* connection,
+ gboolean _result_,
+ const gchar* reason,
+ gpointer self);
DPAPCopy* dpap_copy_new (GError** error);
-DPAPCopy* dpap_copy_construct (GType object_type, GError** error);
+DPAPCopy* dpap_copy_construct (GType object_type,
+ GError** error);
ValaDMAPDb* vala_dmap_db_new (void);
ValaDMAPDb* vala_dmap_db_construct (GType object_type);
ValaDPAPRecordFactory* vala_dpap_record_factory_new (void);
ValaDPAPRecordFactory* vala_dpap_record_factory_construct (GType object_type);
-static void _dpap_copy_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, void*
service, gpointer self);
-static void dpap_copy_finalize (DPAPCopy* obj);
-void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message);
-void debug_null (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message);
-gint _vala_main (gchar** args, int args_length1);
-static void _debug_null_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message,
gpointer self);
-
-
-static void __lambda4_ (DPAPCopy* self, gconstpointer k, gconstpointer v) {
- FILE* _tmp0_ = NULL;
- gconstpointer _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- _tmp0_ = stdout;
- _tmp1_ = v;
- _tmp2_ = vala_dpap_record_get_location (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VALA_DPAP_RECORD,
ValaDPAPRecord));
- _tmp3_ = _tmp2_;
- fprintf (_tmp0_, "%s\n", _tmp3_);
+static void _dpap_copy_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender,
+ void* service,
+ gpointer self);
+static void dpap_copy_finalize (DPAPCopy * obj);
+static GType dpap_copy_get_type_once (void);
+void debug_printf (const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message);
+void debug_null (const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message);
+gint _vala_main (gchar** args,
+ gint args_length1);
+static void _debug_null_glog_func (const gchar* log_domain,
+ GLogLevelFlags log_levels,
+ const gchar* message,
+ gpointer self);
+
+static inline gpointer
+dpap_copy_get_instance_private (DPAPCopy* self)
+{
+ return G_STRUCT_MEMBER_P (self, DPAPCopy_private_offset);
}
+static void
+__lambda4_ (DPAPCopy* self,
+ gconstpointer k,
+ gconstpointer v)
+{
+ FILE* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ _tmp0_ = stdout;
+ _tmp1_ = vala_dpap_record_get_location (G_TYPE_CHECK_INSTANCE_CAST (v, TYPE_VALA_DPAP_RECORD,
ValaDPAPRecord));
+ _tmp2_ = _tmp1_;
+ fprintf (_tmp0_, "%s\n", _tmp2_);
+}
-static void ___lambda4__gh_func (gconstpointer key, gconstpointer value, gpointer self) {
+static void
+___lambda4__gh_func (gconstpointer key,
+ gconstpointer value,
+ gpointer self)
+{
__lambda4_ ((DPAPCopy*) self, key, value);
}
-
-static gboolean dpap_copy_connected_cb (DPAPCopy* self, DMAPConnection* connection, gboolean _result_, const
gchar* reason) {
+static gboolean
+dpap_copy_connected_cb (DPAPCopy* self,
+ DMAPConnection* connection,
+ gboolean _result_,
+ const gchar* reason)
+{
+ ValaDMAPDb* _tmp0_;
+ ValaDMAPDb* _tmp1_;
gboolean result = FALSE;
- ValaDMAPDb* _tmp0_ = NULL;
- gint64 _tmp1_ = 0LL;
- ValaDMAPDb* _tmp2_ = NULL;
g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (connection != NULL, FALSE);
_tmp0_ = self->priv->db;
- _tmp1_ = dmap_db_count ((DMAPDb*) _tmp0_);
- g_debug ("dmapcopy.vala:30: %lld entries\n", _tmp1_);
- _tmp2_ = self->priv->db;
- dmap_db_foreach ((DMAPDb*) _tmp2_, ___lambda4__gh_func, self);
+ g_debug ("%" G_GINT64_FORMAT " entries\n", dmap_db_count ((DMAPDb*) _tmp0_));
+ _tmp1_ = self->priv->db;
+ dmap_db_foreach ((DMAPDb*) _tmp1_, ___lambda4__gh_func, self);
result = TRUE;
return result;
}
-
-static gboolean _dpap_copy_connected_cb_dmap_connection_callback (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self) {
+static gboolean
+_dpap_copy_connected_cb_dmap_connection_callback (DMAPConnection* connection,
+ gboolean _result_,
+ const gchar* reason,
+ gpointer self)
+{
gboolean result;
result = dpap_copy_connected_cb ((DPAPCopy*) self, connection, _result_, reason);
return result;
}
-
-static void dpap_copy_service_added_cb (DPAPCopy* self, DMAPMdnsBrowserService* service) {
- DMAPMdnsBrowserService* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- DMAPMdnsBrowserService* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- DMAPMdnsBrowserService* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
- ValaDMAPDb* _tmp6_ = NULL;
- ValaDPAPRecordFactory* _tmp7_ = NULL;
- DPAPConnection* _tmp8_ = NULL;
- DMAPConnection* _tmp9_ = NULL;
+static void
+dpap_copy_service_added_cb (DPAPCopy* self,
+ DMAPMdnsBrowserService* service)
+{
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ ValaDMAPDb* _tmp2_;
+ ValaDPAPRecordFactory* _tmp3_;
+ DPAPConnection* _tmp4_;
+ DMAPConnection* _tmp5_;
g_return_if_fail (self != NULL);
- _tmp0_ = service;
- _tmp1_ = _tmp0_->service_name;
- _tmp2_ = service;
- _tmp3_ = _tmp2_->host;
- _tmp4_ = service;
- _tmp5_ = _tmp4_->port;
- _tmp6_ = self->priv->db;
- _tmp7_ = self->priv->factory;
- _tmp8_ = dpap_connection_new (_tmp1_, _tmp3_, _tmp5_, (DMAPDb*) _tmp6_, (DMAPRecordFactory*) _tmp7_);
+ _tmp0_ = service->service_name;
+ _tmp1_ = service->host;
+ _tmp2_ = self->priv->db;
+ _tmp3_ = self->priv->factory;
+ _tmp4_ = dpap_connection_new (_tmp0_, _tmp1_, service->port, (DMAPDb*) _tmp2_, (DMAPRecordFactory*)
_tmp3_);
_g_object_unref0 (self->priv->connection);
- self->priv->connection = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, DMAP_TYPE_CONNECTION, DMAPConnection);
- _tmp9_ = self->priv->connection;
- dmap_connection_connect (_tmp9_, _dpap_copy_connected_cb_dmap_connection_callback, self);
+ self->priv->connection = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, DMAP_TYPE_CONNECTION, DMAPConnection);
+ _tmp5_ = self->priv->connection;
+ dmap_connection_connect (_tmp5_, _dpap_copy_connected_cb_dmap_connection_callback, self);
}
-
-static void _dpap_copy_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, void*
service, gpointer self) {
+static void
+_dpap_copy_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender,
+ void* service,
+ gpointer self)
+{
dpap_copy_service_added_cb ((DPAPCopy*) self, service);
}
-
-DPAPCopy* dpap_copy_construct (GType object_type, GError** error) {
+DPAPCopy*
+dpap_copy_construct (GType object_type,
+ GError** error)
+{
DPAPCopy* self = NULL;
- ValaDMAPDb* _tmp0_ = NULL;
- ValaDPAPRecordFactory* _tmp1_ = NULL;
- DMAPMdnsBrowser* _tmp2_ = NULL;
- DMAPMdnsBrowser* _tmp3_ = NULL;
- DMAPMdnsBrowser* _tmp4_ = NULL;
- GError * _inner_error_ = NULL;
+ ValaDMAPDb* _tmp0_;
+ ValaDPAPRecordFactory* _tmp1_;
+ DMAPMdnsBrowser* _tmp2_;
+ DMAPMdnsBrowser* _tmp3_;
+ DMAPMdnsBrowser* _tmp4_;
+ GError* _inner_error0_ = NULL;
self = (DPAPCopy*) g_type_create_instance (object_type);
_tmp0_ = vala_dmap_db_new ();
_g_object_unref0 (self->priv->db);
@@ -232,34 +275,39 @@ DPAPCopy* dpap_copy_construct (GType object_type, GError** error) {
_tmp3_ = self->priv->browser;
g_signal_connect (_tmp3_, "service-added", (GCallback)
_dpap_copy_service_added_cb_dmap_mdns_browser_service_added, self);
_tmp4_ = self->priv->browser;
- dmap_mdns_browser_start (_tmp4_, &_inner_error_);
- if (G_UNLIKELY (_inner_error_ != NULL)) {
- g_propagate_error (error, _inner_error_);
+ dmap_mdns_browser_start (_tmp4_, &_inner_error0_);
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
+ g_propagate_error (error, _inner_error0_);
_dpap_copy_unref0 (self);
return NULL;
}
return self;
}
-
-DPAPCopy* dpap_copy_new (GError** error) {
+DPAPCopy*
+dpap_copy_new (GError** error)
+{
return dpap_copy_construct (TYPE_DPAP_COPY, error);
}
-
-static void value_dpap_copy_init (GValue* value) {
+static void
+value_dpap_copy_init (GValue* value)
+{
value->data[0].v_pointer = NULL;
}
-
-static void value_dpap_copy_free_value (GValue* value) {
+static void
+value_dpap_copy_free_value (GValue* value)
+{
if (value->data[0].v_pointer) {
dpap_copy_unref (value->data[0].v_pointer);
}
}
-
-static void value_dpap_copy_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_dpap_copy_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
if (src_value->data[0].v_pointer) {
dest_value->data[0].v_pointer = dpap_copy_ref (src_value->data[0].v_pointer);
} else {
@@ -267,15 +315,20 @@ static void value_dpap_copy_copy_value (const GValue* src_value, GValue* dest_va
}
}
-
-static gpointer value_dpap_copy_peek_pointer (const GValue* value) {
+static gpointer
+value_dpap_copy_peek_pointer (const GValue* value)
+{
return value->data[0].v_pointer;
}
-
-static gchar* value_dpap_copy_collect_value (GValue* value, guint n_collect_values, GTypeCValue*
collect_values, guint collect_flags) {
+static gchar*
+value_dpap_copy_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
if (collect_values[0].v_pointer) {
- DPAPCopy* object;
+ DPAPCopy * object;
object = collect_values[0].v_pointer;
if (object->parent_instance.g_class == NULL) {
return g_strconcat ("invalid unclassed object pointer for value type `",
G_VALUE_TYPE_NAME (value), "'", NULL);
@@ -289,9 +342,13 @@ static gchar* value_dpap_copy_collect_value (GValue* value, guint n_collect_valu
return NULL;
}
-
-static gchar* value_dpap_copy_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue*
collect_values, guint collect_flags) {
- DPAPCopy** object_p;
+static gchar*
+value_dpap_copy_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
+ DPAPCopy ** object_p;
object_p = collect_values[0].v_pointer;
if (!object_p) {
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
@@ -306,8 +363,13 @@ static gchar* value_dpap_copy_lcopy_value (const GValue* value, guint n_collect_
return NULL;
}
-
-GParamSpec* param_spec_dpap_copy (const gchar* name, const gchar* nick, const gchar* blurb, GType
object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_dpap_copy (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
ParamSpecDPAPCopy* spec;
g_return_val_if_fail (g_type_is_a (object_type, TYPE_DPAP_COPY), NULL);
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
@@ -315,15 +377,18 @@ GParamSpec* param_spec_dpap_copy (const gchar* name, const gchar* nick, const gc
return G_PARAM_SPEC (spec);
}
-
-gpointer value_get_dpap_copy (const GValue* value) {
+gpointer
+value_get_dpap_copy (const GValue* value)
+{
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_COPY), NULL);
return value->data[0].v_pointer;
}
-
-void value_set_dpap_copy (GValue* value, gpointer v_object) {
- DPAPCopy* old;
+void
+value_set_dpap_copy (GValue* value,
+ gpointer v_object)
+{
+ DPAPCopy * old;
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_COPY));
old = value->data[0].v_pointer;
if (v_object) {
@@ -339,9 +404,11 @@ void value_set_dpap_copy (GValue* value, gpointer v_object) {
}
}
-
-void value_take_dpap_copy (GValue* value, gpointer v_object) {
- DPAPCopy* old;
+void
+value_take_dpap_copy (GValue* value,
+ gpointer v_object)
+{
+ DPAPCopy * old;
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_COPY));
old = value->data[0].v_pointer;
if (v_object) {
@@ -356,21 +423,26 @@ void value_take_dpap_copy (GValue* value, gpointer v_object) {
}
}
-
-static void dpap_copy_class_init (DPAPCopyClass * klass) {
+static void
+dpap_copy_class_init (DPAPCopyClass * klass,
+ gpointer klass_data)
+{
dpap_copy_parent_class = g_type_class_peek_parent (klass);
((DPAPCopyClass *) klass)->finalize = dpap_copy_finalize;
- g_type_class_add_private (klass, sizeof (DPAPCopyPrivate));
+ g_type_class_adjust_private_offset (klass, &DPAPCopy_private_offset);
}
-
-static void dpap_copy_instance_init (DPAPCopy * self) {
- self->priv = DPAP_COPY_GET_PRIVATE (self);
+static void
+dpap_copy_instance_init (DPAPCopy * self,
+ gpointer klass)
+{
+ self->priv = dpap_copy_get_instance_private (self);
self->ref_count = 1;
}
-
-static void dpap_copy_finalize (DPAPCopy* obj) {
+static void
+dpap_copy_finalize (DPAPCopy * obj)
+{
DPAPCopy * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DPAP_COPY, DPAPCopy);
g_signal_handlers_destroy (self);
@@ -380,31 +452,43 @@ static void dpap_copy_finalize (DPAPCopy* obj) {
_g_object_unref0 (self->priv->factory);
}
+static GType
+dpap_copy_get_type_once (void)
+{
+ static const GTypeValueTable g_define_type_value_table = { value_dpap_copy_init,
value_dpap_copy_free_value, value_dpap_copy_copy_value, value_dpap_copy_peek_pointer, "p",
value_dpap_copy_collect_value, "p", value_dpap_copy_lcopy_value };
+ static const GTypeInfo g_define_type_info = { sizeof (DPAPCopyClass), (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GClassInitFunc) dpap_copy_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof
(DPAPCopy), 0, (GInstanceInitFunc) dpap_copy_instance_init, &g_define_type_value_table };
+ static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED |
G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+ GType dpap_copy_type_id;
+ dpap_copy_type_id = g_type_register_fundamental (g_type_fundamental_next (), "DPAPCopy",
&g_define_type_info, &g_define_type_fundamental_info, 0);
+ DPAPCopy_private_offset = g_type_add_instance_private (dpap_copy_type_id, sizeof (DPAPCopyPrivate));
+ return dpap_copy_type_id;
+}
-GType dpap_copy_get_type (void) {
+GType
+dpap_copy_get_type (void)
+{
static volatile gsize dpap_copy_type_id__volatile = 0;
if (g_once_init_enter (&dpap_copy_type_id__volatile)) {
- static const GTypeValueTable g_define_type_value_table = { value_dpap_copy_init,
value_dpap_copy_free_value, value_dpap_copy_copy_value, value_dpap_copy_peek_pointer, "p",
value_dpap_copy_collect_value, "p", value_dpap_copy_lcopy_value };
- static const GTypeInfo g_define_type_info = { sizeof (DPAPCopyClass), (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GClassInitFunc) dpap_copy_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof
(DPAPCopy), 0, (GInstanceInitFunc) dpap_copy_instance_init, &g_define_type_value_table };
- static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED |
G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
GType dpap_copy_type_id;
- dpap_copy_type_id = g_type_register_fundamental (g_type_fundamental_next (), "DPAPCopy",
&g_define_type_info, &g_define_type_fundamental_info, 0);
+ dpap_copy_type_id = dpap_copy_get_type_once ();
g_once_init_leave (&dpap_copy_type_id__volatile, dpap_copy_type_id);
}
return dpap_copy_type_id__volatile;
}
-
-gpointer dpap_copy_ref (gpointer instance) {
- DPAPCopy* self;
+gpointer
+dpap_copy_ref (gpointer instance)
+{
+ DPAPCopy * self;
self = instance;
g_atomic_int_inc (&self->ref_count);
return instance;
}
-
-void dpap_copy_unref (gpointer instance) {
- DPAPCopy* self;
+void
+dpap_copy_unref (gpointer instance)
+{
+ DPAPCopy * self;
self = instance;
if (g_atomic_int_dec_and_test (&self->ref_count)) {
DPAP_COPY_GET_CLASS (self)->finalize (self);
@@ -412,43 +496,54 @@ void dpap_copy_unref (gpointer instance) {
}
}
-
-void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
- FILE* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+void
+debug_printf (const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message)
+{
+ FILE* _tmp0_;
_tmp0_ = stdout;
- _tmp1_ = message;
- fprintf (_tmp0_, "%s\n", _tmp1_);
+ fprintf (_tmp0_, "%s\n", message);
}
-
-void debug_null (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
+void
+debug_null (const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message)
+{
}
-
-static void _debug_null_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message,
gpointer self) {
+static void
+_debug_null_glog_func (const gchar* log_domain,
+ GLogLevelFlags log_levels,
+ const gchar* message,
+ gpointer self)
+{
debug_null (log_domain, log_levels, message);
}
-
-gint _vala_main (gchar** args, int args_length1) {
- gint result = 0;
+gint
+_vala_main (gchar** args,
+ gint args_length1)
+{
GMainLoop* loop = NULL;
- GMainLoop* _tmp0_ = NULL;
+ GMainLoop* _tmp0_;
DPAPCopy* dmapcopy = NULL;
- DPAPCopy* _tmp1_ = NULL;
- GError * _inner_error_ = NULL;
+ DPAPCopy* _tmp1_;
+ GError* _inner_error0_ = NULL;
+ gint result = 0;
_tmp0_ = g_main_loop_new (NULL, FALSE);
loop = _tmp0_;
g_log_set_handler ("libdmapsharing", G_LOG_LEVEL_DEBUG, _debug_null_glog_func, NULL);
g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, _debug_null_glog_func, NULL);
- _tmp1_ = dpap_copy_new (&_inner_error_);
+ _tmp1_ = dpap_copy_new (&_inner_error0_);
dmapcopy = _tmp1_;
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
+ gint _tmp2_ = -1;
_g_main_loop_unref0 (loop);
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
- g_clear_error (&_inner_error_);
- return 0;
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error0_->message, g_quark_to_string (_inner_error0_->domain), _inner_error0_->code);
+ g_clear_error (&_inner_error0_);
+ return _tmp2_;
}
g_main_loop_run (loop);
result = 0;
@@ -457,13 +552,10 @@ gint _vala_main (gchar** args, int args_length1) {
return result;
}
-
-int main (int argc, char ** argv) {
-#if !GLIB_CHECK_VERSION (2,35,0)
- g_type_init ();
-#endif
+int
+main (int argc,
+ char ** argv)
+{
return _vala_main (argv, argc);
}
-
-
diff --git a/tests/dmapserve.c b/tests/dmapserve.c
index e8891e5..05179cd 100644
--- a/tests/dmapserve.c
+++ b/tests/dmapserve.c
@@ -1,4 +1,4 @@
-/* dmapserve.c generated by valac 0.27.2, the Vala compiler
+/* dmapserve.c generated by valac 0.48.6, the Vala compiler
* generated from dmapserve.vala, do not modify */
/* FILE: dmapserve.vala -- Serve media using DMAP
@@ -23,14 +23,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <glib.h>
#include <glib-object.h>
#include <libdmapsharing/dmap.h>
+#include <glib.h>
+#include <gobject/gvaluecollector.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <gobject/gvaluecollector.h>
-
#define TYPE_DPAP_SERVE (dpap_serve_get_type ())
#define DPAP_SERVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DPAP_SERVE, DPAPServe))
@@ -99,48 +98,72 @@ struct _ParamSpecDPAPServe {
GParamSpec parent_instance;
};
-
+static gint DPAPServe_private_offset;
static gpointer dpap_serve_parent_class = NULL;
gpointer dpap_serve_ref (gpointer instance);
void dpap_serve_unref (gpointer instance);
-GParamSpec* param_spec_dpap_serve (const gchar* name, const gchar* nick, const gchar* blurb, GType
object_type, GParamFlags flags);
-void value_set_dpap_serve (GValue* value, gpointer v_object);
-void value_take_dpap_serve (GValue* value, gpointer v_object);
+GParamSpec* param_spec_dpap_serve (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_dpap_serve (GValue* value,
+ gpointer v_object);
+void value_take_dpap_serve (GValue* value,
+ gpointer v_object);
gpointer value_get_dpap_serve (const GValue* value);
GType dpap_serve_get_type (void) G_GNUC_CONST;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (DPAPServe, dpap_serve_unref)
GType vala_dpap_record_get_type (void) G_GNUC_CONST;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDPAPRecord, g_object_unref)
GType vala_dmap_db_get_type (void) G_GNUC_CONST;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDMAPDb, g_object_unref)
GType vala_dmap_container_db_get_type (void) G_GNUC_CONST;
-#define DPAP_SERVE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DPAP_SERVE, DPAPServePrivate))
-enum {
- DPAP_SERVE_DUMMY_PROPERTY
-};
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDMAPContainerDb, g_object_unref)
DPAPServe* dpap_serve_new (GError** error);
-DPAPServe* dpap_serve_construct (GType object_type, GError** error);
+DPAPServe* dpap_serve_construct (GType object_type,
+ GError** error);
ValaDPAPRecord* vala_dpap_record_new (void);
ValaDPAPRecord* vala_dpap_record_construct (GType object_type);
ValaDMAPDb* vala_dmap_db_new (void);
ValaDMAPDb* vala_dmap_db_construct (GType object_type);
ValaDMAPContainerDb* vala_dmap_container_db_new (void);
ValaDMAPContainerDb* vala_dmap_container_db_construct (GType object_type);
-static void dpap_serve_finalize (DPAPServe* obj);
-void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message);
-void debug_null (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message);
-gint _vala_main (gchar** args, int args_length1);
-static void _debug_printf_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar*
message, gpointer self);
-
+static void dpap_serve_finalize (DPAPServe * obj);
+static GType dpap_serve_get_type_once (void);
+void debug_printf (const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message);
+void debug_null (const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message);
+gint _vala_main (gchar** args,
+ gint args_length1);
+static void _debug_printf_glog_func (const gchar* log_domain,
+ GLogLevelFlags log_levels,
+ const gchar* message,
+ gpointer self);
+
+static inline gpointer
+dpap_serve_get_instance_private (DPAPServe* self)
+{
+ return G_STRUCT_MEMBER_P (self, DPAPServe_private_offset);
+}
-DPAPServe* dpap_serve_construct (GType object_type, GError** error) {
+DPAPServe*
+dpap_serve_construct (GType object_type,
+ GError** error)
+{
DPAPServe* self = NULL;
- ValaDPAPRecord* _tmp0_ = NULL;
- ValaDMAPDb* _tmp1_ = NULL;
- ValaDMAPDb* _tmp2_ = NULL;
- ValaDPAPRecord* _tmp3_ = NULL;
- ValaDMAPContainerDb* _tmp4_ = NULL;
- ValaDMAPDb* _tmp5_ = NULL;
- ValaDMAPContainerDb* _tmp6_ = NULL;
- DPAPShare* _tmp7_ = NULL;
+ ValaDPAPRecord* _tmp0_;
+ ValaDMAPDb* _tmp1_;
+ ValaDMAPDb* _tmp2_;
+ ValaDPAPRecord* _tmp3_;
+ ValaDMAPContainerDb* _tmp4_;
+ ValaDMAPDb* _tmp5_;
+ ValaDMAPContainerDb* _tmp6_;
+ DPAPShare* _tmp7_;
self = (DPAPServe*) g_type_create_instance (object_type);
_tmp0_ = vala_dpap_record_new ();
_g_object_unref0 (self->priv->record);
@@ -162,25 +185,30 @@ DPAPServe* dpap_serve_construct (GType object_type, GError** error) {
return self;
}
-
-DPAPServe* dpap_serve_new (GError** error) {
+DPAPServe*
+dpap_serve_new (GError** error)
+{
return dpap_serve_construct (TYPE_DPAP_SERVE, error);
}
-
-static void value_dpap_serve_init (GValue* value) {
+static void
+value_dpap_serve_init (GValue* value)
+{
value->data[0].v_pointer = NULL;
}
-
-static void value_dpap_serve_free_value (GValue* value) {
+static void
+value_dpap_serve_free_value (GValue* value)
+{
if (value->data[0].v_pointer) {
dpap_serve_unref (value->data[0].v_pointer);
}
}
-
-static void value_dpap_serve_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_dpap_serve_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
if (src_value->data[0].v_pointer) {
dest_value->data[0].v_pointer = dpap_serve_ref (src_value->data[0].v_pointer);
} else {
@@ -188,15 +216,20 @@ static void value_dpap_serve_copy_value (const GValue* src_value, GValue* dest_v
}
}
-
-static gpointer value_dpap_serve_peek_pointer (const GValue* value) {
+static gpointer
+value_dpap_serve_peek_pointer (const GValue* value)
+{
return value->data[0].v_pointer;
}
-
-static gchar* value_dpap_serve_collect_value (GValue* value, guint n_collect_values, GTypeCValue*
collect_values, guint collect_flags) {
+static gchar*
+value_dpap_serve_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
if (collect_values[0].v_pointer) {
- DPAPServe* object;
+ DPAPServe * object;
object = collect_values[0].v_pointer;
if (object->parent_instance.g_class == NULL) {
return g_strconcat ("invalid unclassed object pointer for value type `",
G_VALUE_TYPE_NAME (value), "'", NULL);
@@ -210,9 +243,13 @@ static gchar* value_dpap_serve_collect_value (GValue* value, guint n_collect_val
return NULL;
}
-
-static gchar* value_dpap_serve_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue*
collect_values, guint collect_flags) {
- DPAPServe** object_p;
+static gchar*
+value_dpap_serve_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
+ DPAPServe ** object_p;
object_p = collect_values[0].v_pointer;
if (!object_p) {
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
@@ -227,8 +264,13 @@ static gchar* value_dpap_serve_lcopy_value (const GValue* value, guint n_collect
return NULL;
}
-
-GParamSpec* param_spec_dpap_serve (const gchar* name, const gchar* nick, const gchar* blurb, GType
object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_dpap_serve (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
ParamSpecDPAPServe* spec;
g_return_val_if_fail (g_type_is_a (object_type, TYPE_DPAP_SERVE), NULL);
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
@@ -236,15 +278,18 @@ GParamSpec* param_spec_dpap_serve (const gchar* name, const gchar* nick, const g
return G_PARAM_SPEC (spec);
}
-
-gpointer value_get_dpap_serve (const GValue* value) {
+gpointer
+value_get_dpap_serve (const GValue* value)
+{
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_SERVE), NULL);
return value->data[0].v_pointer;
}
-
-void value_set_dpap_serve (GValue* value, gpointer v_object) {
- DPAPServe* old;
+void
+value_set_dpap_serve (GValue* value,
+ gpointer v_object)
+{
+ DPAPServe * old;
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_SERVE));
old = value->data[0].v_pointer;
if (v_object) {
@@ -260,9 +305,11 @@ void value_set_dpap_serve (GValue* value, gpointer v_object) {
}
}
-
-void value_take_dpap_serve (GValue* value, gpointer v_object) {
- DPAPServe* old;
+void
+value_take_dpap_serve (GValue* value,
+ gpointer v_object)
+{
+ DPAPServe * old;
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_SERVE));
old = value->data[0].v_pointer;
if (v_object) {
@@ -277,21 +324,26 @@ void value_take_dpap_serve (GValue* value, gpointer v_object) {
}
}
-
-static void dpap_serve_class_init (DPAPServeClass * klass) {
+static void
+dpap_serve_class_init (DPAPServeClass * klass,
+ gpointer klass_data)
+{
dpap_serve_parent_class = g_type_class_peek_parent (klass);
((DPAPServeClass *) klass)->finalize = dpap_serve_finalize;
- g_type_class_add_private (klass, sizeof (DPAPServePrivate));
+ g_type_class_adjust_private_offset (klass, &DPAPServe_private_offset);
}
-
-static void dpap_serve_instance_init (DPAPServe * self) {
- self->priv = DPAP_SERVE_GET_PRIVATE (self);
+static void
+dpap_serve_instance_init (DPAPServe * self,
+ gpointer klass)
+{
+ self->priv = dpap_serve_get_instance_private (self);
self->ref_count = 1;
}
-
-static void dpap_serve_finalize (DPAPServe* obj) {
+static void
+dpap_serve_finalize (DPAPServe * obj)
+{
DPAPServe * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DPAP_SERVE, DPAPServe);
g_signal_handlers_destroy (self);
@@ -301,31 +353,43 @@ static void dpap_serve_finalize (DPAPServe* obj) {
_g_object_unref0 (self->priv->share);
}
+static GType
+dpap_serve_get_type_once (void)
+{
+ static const GTypeValueTable g_define_type_value_table = { value_dpap_serve_init,
value_dpap_serve_free_value, value_dpap_serve_copy_value, value_dpap_serve_peek_pointer, "p",
value_dpap_serve_collect_value, "p", value_dpap_serve_lcopy_value };
+ static const GTypeInfo g_define_type_info = { sizeof (DPAPServeClass), (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GClassInitFunc) dpap_serve_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof
(DPAPServe), 0, (GInstanceInitFunc) dpap_serve_instance_init, &g_define_type_value_table };
+ static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED |
G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+ GType dpap_serve_type_id;
+ dpap_serve_type_id = g_type_register_fundamental (g_type_fundamental_next (), "DPAPServe",
&g_define_type_info, &g_define_type_fundamental_info, 0);
+ DPAPServe_private_offset = g_type_add_instance_private (dpap_serve_type_id, sizeof
(DPAPServePrivate));
+ return dpap_serve_type_id;
+}
-GType dpap_serve_get_type (void) {
+GType
+dpap_serve_get_type (void)
+{
static volatile gsize dpap_serve_type_id__volatile = 0;
if (g_once_init_enter (&dpap_serve_type_id__volatile)) {
- static const GTypeValueTable g_define_type_value_table = { value_dpap_serve_init,
value_dpap_serve_free_value, value_dpap_serve_copy_value, value_dpap_serve_peek_pointer, "p",
value_dpap_serve_collect_value, "p", value_dpap_serve_lcopy_value };
- static const GTypeInfo g_define_type_info = { sizeof (DPAPServeClass), (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GClassInitFunc) dpap_serve_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof
(DPAPServe), 0, (GInstanceInitFunc) dpap_serve_instance_init, &g_define_type_value_table };
- static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED |
G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
GType dpap_serve_type_id;
- dpap_serve_type_id = g_type_register_fundamental (g_type_fundamental_next (), "DPAPServe",
&g_define_type_info, &g_define_type_fundamental_info, 0);
+ dpap_serve_type_id = dpap_serve_get_type_once ();
g_once_init_leave (&dpap_serve_type_id__volatile, dpap_serve_type_id);
}
return dpap_serve_type_id__volatile;
}
-
-gpointer dpap_serve_ref (gpointer instance) {
- DPAPServe* self;
+gpointer
+dpap_serve_ref (gpointer instance)
+{
+ DPAPServe * self;
self = instance;
g_atomic_int_inc (&self->ref_count);
return instance;
}
-
-void dpap_serve_unref (gpointer instance) {
- DPAPServe* self;
+void
+dpap_serve_unref (gpointer instance)
+{
+ DPAPServe * self;
self = instance;
if (g_atomic_int_dec_and_test (&self->ref_count)) {
DPAP_SERVE_GET_CLASS (self)->finalize (self);
@@ -333,43 +397,54 @@ void dpap_serve_unref (gpointer instance) {
}
}
-
-void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
- FILE* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+void
+debug_printf (const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message)
+{
+ FILE* _tmp0_;
_tmp0_ = stdout;
- _tmp1_ = message;
- fprintf (_tmp0_, "%s\n", _tmp1_);
+ fprintf (_tmp0_, "%s\n", message);
}
-
-void debug_null (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
+void
+debug_null (const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message)
+{
}
-
-static void _debug_printf_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar*
message, gpointer self) {
+static void
+_debug_printf_glog_func (const gchar* log_domain,
+ GLogLevelFlags log_levels,
+ const gchar* message,
+ gpointer self)
+{
debug_printf (log_domain, log_levels, message);
}
-
-gint _vala_main (gchar** args, int args_length1) {
- gint result = 0;
+gint
+_vala_main (gchar** args,
+ gint args_length1)
+{
GMainLoop* loop = NULL;
- GMainLoop* _tmp0_ = NULL;
+ GMainLoop* _tmp0_;
DPAPServe* dmapcopy = NULL;
- DPAPServe* _tmp1_ = NULL;
- GError * _inner_error_ = NULL;
+ DPAPServe* _tmp1_;
+ GError* _inner_error0_ = NULL;
+ gint result = 0;
_tmp0_ = g_main_loop_new (NULL, FALSE);
loop = _tmp0_;
g_log_set_handler ("libdmapsharing", G_LOG_LEVEL_DEBUG, _debug_printf_glog_func, NULL);
g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, _debug_printf_glog_func, NULL);
- _tmp1_ = dpap_serve_new (&_inner_error_);
+ _tmp1_ = dpap_serve_new (&_inner_error0_);
dmapcopy = _tmp1_;
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
+ gint _tmp2_ = -1;
_g_main_loop_unref0 (loop);
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
- g_clear_error (&_inner_error_);
- return 0;
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error0_->message, g_quark_to_string (_inner_error0_->domain), _inner_error0_->code);
+ g_clear_error (&_inner_error0_);
+ return _tmp2_;
}
g_main_loop_run (loop);
result = 0;
@@ -378,13 +453,10 @@ gint _vala_main (gchar** args, int args_length1) {
return result;
}
-
-int main (int argc, char ** argv) {
-#if !GLIB_CHECK_VERSION (2,35,0)
- g_type_init ();
-#endif
+int
+main (int argc,
+ char ** argv)
+{
return _vala_main (argv, argc);
}
-
-
diff --git a/tests/dpapview.c b/tests/dpapview.c
index 09a8f73..07453be 100644
--- a/tests/dpapview.c
+++ b/tests/dpapview.c
@@ -1,4 +1,4 @@
-/* dpapview.c generated by valac 0.27.2, the Vala compiler
+/* dpapview.c generated by valac 0.48.6, the Vala compiler
* generated from dpapview.vala, do not modify */
/* FILE: dpapviewer.vala -- View DPAP data
@@ -23,18 +23,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <glib.h>
#include <glib-object.h>
#include <libdmapsharing/dmap.h>
#include <gtk/gtk.h>
+#include <glib.h>
#include <stdlib.h>
#include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
#include <unistd.h>
-#include <stdio.h>
#include <gobject/gvaluecollector.h>
-
+#include <stdio.h>
#define TYPE_DPAP_VIEWER (dpap_viewer_get_type ())
#define DPAP_VIEWER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DPAP_VIEWER, DPAPViewer))
@@ -105,259 +104,286 @@ struct _ParamSpecDPAPViewer {
GParamSpec parent_instance;
};
-
+static gint DPAPViewer_private_offset;
static gpointer dpap_viewer_parent_class = NULL;
gpointer dpap_viewer_ref (gpointer instance);
void dpap_viewer_unref (gpointer instance);
-GParamSpec* param_spec_dpap_viewer (const gchar* name, const gchar* nick, const gchar* blurb, GType
object_type, GParamFlags flags);
-void value_set_dpap_viewer (GValue* value, gpointer v_object);
-void value_take_dpap_viewer (GValue* value, gpointer v_object);
+GParamSpec* param_spec_dpap_viewer (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_dpap_viewer (GValue* value,
+ gpointer v_object);
+void value_take_dpap_viewer (GValue* value,
+ gpointer v_object);
gpointer value_get_dpap_viewer (const GValue* value);
GType dpap_viewer_get_type (void) G_GNUC_CONST;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (DPAPViewer, dpap_viewer_unref)
GType vala_dmap_db_get_type (void) G_GNUC_CONST;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDMAPDb, g_object_unref)
GType vala_dpap_record_factory_get_type (void) G_GNUC_CONST;
-#define DPAP_VIEWER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DPAP_VIEWER, DPAPViewerPrivate))
-enum {
- DPAP_VIEWER_DUMMY_PROPERTY
-};
-static gboolean dpap_viewer_connected_cb (DPAPViewer* self, DMAPConnection* connection, gboolean _result_,
const gchar* reason);
-static void __lambda4_ (DPAPViewer* self, gconstpointer k, gconstpointer v);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDPAPRecordFactory, g_object_unref)
+static gboolean dpap_viewer_connected_cb (DPAPViewer* self,
+ DMAPConnection* connection,
+ gboolean _result_,
+ const gchar* reason);
+static void __lambda4_ (DPAPViewer* self,
+ gconstpointer k,
+ gconstpointer v);
GType vala_dpap_record_get_type (void) G_GNUC_CONST;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDPAPRecord, g_object_unref)
GByteArray* vala_dpap_record_get_thumbnail (ValaDPAPRecord* self);
const gchar* vala_dpap_record_get_filename (ValaDPAPRecord* self);
-static void ___lambda4__gh_func (gconstpointer key, gconstpointer value, gpointer self);
-static void dpap_viewer_service_added_cb (DPAPViewer* self, DMAPMdnsBrowserService* service);
-static gboolean _dpap_viewer_connected_cb_dmap_connection_callback (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self);
-DPAPViewer* dpap_viewer_new (GtkBuilder* builder, GError** error);
-DPAPViewer* dpap_viewer_construct (GType object_type, GtkBuilder* builder, GError** error);
+static void ___lambda4__gh_func (gconstpointer key,
+ gconstpointer value,
+ gpointer self);
+static void dpap_viewer_service_added_cb (DPAPViewer* self,
+ DMAPMdnsBrowserService* service);
+static gboolean _dpap_viewer_connected_cb_dmap_connection_callback (DMAPConnection* connection,
+ gboolean _result_,
+ const gchar* reason,
+ gpointer self);
+DPAPViewer* dpap_viewer_new (GtkBuilder* builder,
+ GError** error);
+DPAPViewer* dpap_viewer_construct (GType object_type,
+ GtkBuilder* builder,
+ GError** error);
ValaDMAPDb* vala_dmap_db_new (void);
ValaDMAPDb* vala_dmap_db_construct (GType object_type);
ValaDPAPRecordFactory* vala_dpap_record_factory_new (void);
ValaDPAPRecordFactory* vala_dpap_record_factory_construct (GType object_type);
-static void _dpap_viewer_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, void*
service, gpointer self);
-static void dpap_viewer_finalize (DPAPViewer* obj);
-gint _vala_main (gchar** args, int args_length1);
-
+static void _dpap_viewer_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender,
+ void* service,
+ gpointer self);
+static void dpap_viewer_finalize (DPAPViewer * obj);
+static GType dpap_viewer_get_type_once (void);
+gint _vala_main (gchar** args,
+ gint args_length1);
+
+static inline gpointer
+dpap_viewer_get_instance_private (DPAPViewer* self)
+{
+ return G_STRUCT_MEMBER_P (self, DPAPViewer_private_offset);
+}
-static void __lambda4_ (DPAPViewer* self, gconstpointer k, gconstpointer v) {
+static void
+__lambda4_ (DPAPViewer* self,
+ gconstpointer k,
+ gconstpointer v)
+{
GdkPixbuf* pixbuf = NULL;
- gconstpointer _tmp0_ = NULL;
- GByteArray* _tmp1_ = NULL;
- GByteArray* _tmp2_ = NULL;
+ GByteArray* _tmp0_;
+ GByteArray* _tmp1_;
GtkTreeIter iter = {0};
- GtkListStore* _tmp16_ = NULL;
- GtkTreeIter _tmp17_ = {0};
- GtkListStore* _tmp18_ = NULL;
- GtkTreeIter _tmp19_ = {0};
- GdkPixbuf* _tmp20_ = NULL;
- gconstpointer _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
- GError * _inner_error_ = NULL;
+ GtkListStore* _tmp13_;
+ GtkTreeIter _tmp14_ = {0};
+ GtkListStore* _tmp15_;
+ GtkTreeIter _tmp16_;
+ GdkPixbuf* _tmp17_;
+ const gchar* _tmp18_;
+ const gchar* _tmp19_;
+ GError* _inner_error0_ = NULL;
pixbuf = NULL;
- _tmp0_ = v;
- _tmp1_ = vala_dpap_record_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VALA_DPAP_RECORD,
ValaDPAPRecord));
- _tmp2_ = _tmp1_;
- if (_tmp2_ != NULL) {
+ _tmp0_ = vala_dpap_record_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (v, TYPE_VALA_DPAP_RECORD,
ValaDPAPRecord));
+ _tmp1_ = _tmp0_;
+ if (_tmp1_ != NULL) {
gchar* path = NULL;
gint fd = 0;
- gchar* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- const gchar* _tmp5_ = NULL;
- gconstpointer _tmp6_ = NULL;
- GByteArray* _tmp7_ = NULL;
- GByteArray* _tmp8_ = NULL;
- guint8* _tmp9_ = NULL;
- gint _tmp9__length1 = 0;
- gint _tmp10_ = 0;
- GdkPixbuf* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- GdkPixbuf* _tmp13_ = NULL;
- GdkPixbuf* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- _tmp4_ = g_file_open_tmp ("dpapview.XXXXXX", &_tmp3_, &_inner_error_);
+ gchar* _tmp2_ = NULL;
+ gint _tmp3_;
+ const gchar* _tmp4_;
+ GByteArray* _tmp5_;
+ GByteArray* _tmp6_;
+ guint8* _tmp7_;
+ gint _tmp7__length1;
+ GdkPixbuf* _tmp8_ = NULL;
+ const gchar* _tmp9_;
+ GdkPixbuf* _tmp10_;
+ GdkPixbuf* _tmp11_;
+ const gchar* _tmp12_;
+ _tmp3_ = g_file_open_tmp ("dpapview.XXXXXX", &_tmp2_, &_inner_error0_);
_g_free0 (path);
- path = _tmp3_;
- fd = _tmp4_;
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ path = _tmp2_;
+ fd = _tmp3_;
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
_g_free0 (path);
_g_object_unref0 (pixbuf);
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
- g_clear_error (&_inner_error_);
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error0_->message, g_quark_to_string (_inner_error0_->domain), _inner_error0_->code);
+ g_clear_error (&_inner_error0_);
return;
}
- _tmp5_ = path;
- _tmp6_ = v;
- _tmp7_ = vala_dpap_record_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_,
TYPE_VALA_DPAP_RECORD, ValaDPAPRecord));
- _tmp8_ = _tmp7_;
- _tmp9_ = _tmp8_->data;
- _tmp9__length1 = (gint) _tmp8_->len;
- g_file_set_contents (_tmp5_, (const char*) _tmp9_, (size_t) _tmp9__length1, &_inner_error_);
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ _tmp4_ = path;
+ _tmp5_ = vala_dpap_record_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (v,
TYPE_VALA_DPAP_RECORD, ValaDPAPRecord));
+ _tmp6_ = _tmp5_;
+ _tmp7_ = _tmp6_->data;
+ _tmp7__length1 = _tmp6_->len;
+ g_file_set_contents (_tmp4_, (const char*) _tmp7_, (size_t) _tmp7__length1, &_inner_error0_);
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
_g_free0 (path);
_g_object_unref0 (pixbuf);
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
- g_clear_error (&_inner_error_);
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error0_->message, g_quark_to_string (_inner_error0_->domain), _inner_error0_->code);
+ g_clear_error (&_inner_error0_);
return;
}
- _tmp10_ = fd;
- close (_tmp10_);
- _tmp12_ = path;
- _tmp13_ = gdk_pixbuf_new_from_file (_tmp12_, &_inner_error_);
- _tmp11_ = _tmp13_;
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ close (fd);
+ _tmp9_ = path;
+ _tmp10_ = gdk_pixbuf_new_from_file (_tmp9_, &_inner_error0_);
+ _tmp8_ = _tmp10_;
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
_g_free0 (path);
_g_object_unref0 (pixbuf);
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
- g_clear_error (&_inner_error_);
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error0_->message, g_quark_to_string (_inner_error0_->domain), _inner_error0_->code);
+ g_clear_error (&_inner_error0_);
return;
}
- _tmp14_ = _tmp11_;
- _tmp11_ = NULL;
+ _tmp11_ = _tmp8_;
+ _tmp8_ = NULL;
_g_object_unref0 (pixbuf);
- pixbuf = _tmp14_;
- _tmp15_ = path;
- g_unlink (_tmp15_);
- _g_object_unref0 (_tmp11_);
+ pixbuf = _tmp11_;
+ _tmp12_ = path;
+ g_unlink (_tmp12_);
+ _g_object_unref0 (_tmp8_);
_g_free0 (path);
}
- _tmp16_ = self->priv->liststore;
- gtk_list_store_append (_tmp16_, &_tmp17_);
- iter = _tmp17_;
- _tmp18_ = self->priv->liststore;
- _tmp19_ = iter;
- _tmp20_ = pixbuf;
- _tmp21_ = v;
- _tmp22_ = vala_dpap_record_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_VALA_DPAP_RECORD,
ValaDPAPRecord));
- _tmp23_ = _tmp22_;
- gtk_list_store_set (_tmp18_, &_tmp19_, 0, _tmp20_, 1, _tmp23_, -1);
+ _tmp13_ = self->priv->liststore;
+ gtk_list_store_append (_tmp13_, &_tmp14_);
+ iter = _tmp14_;
+ _tmp15_ = self->priv->liststore;
+ _tmp16_ = iter;
+ _tmp17_ = pixbuf;
+ _tmp18_ = vala_dpap_record_get_filename (G_TYPE_CHECK_INSTANCE_CAST (v, TYPE_VALA_DPAP_RECORD,
ValaDPAPRecord));
+ _tmp19_ = _tmp18_;
+ gtk_list_store_set (_tmp15_, &_tmp16_, 0, _tmp17_, 1, _tmp19_, -1);
_g_object_unref0 (pixbuf);
}
-
-static void ___lambda4__gh_func (gconstpointer key, gconstpointer value, gpointer self) {
+static void
+___lambda4__gh_func (gconstpointer key,
+ gconstpointer value,
+ gpointer self)
+{
__lambda4_ ((DPAPViewer*) self, key, value);
}
-
-static gboolean dpap_viewer_connected_cb (DPAPViewer* self, DMAPConnection* connection, gboolean _result_,
const gchar* reason) {
+static gboolean
+dpap_viewer_connected_cb (DPAPViewer* self,
+ DMAPConnection* connection,
+ gboolean _result_,
+ const gchar* reason)
+{
+ ValaDMAPDb* _tmp0_;
+ ValaDMAPDb* _tmp1_;
gboolean result = FALSE;
- ValaDMAPDb* _tmp0_ = NULL;
- gint64 _tmp1_ = 0LL;
- ValaDMAPDb* _tmp2_ = NULL;
g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (connection != NULL, FALSE);
_tmp0_ = self->priv->db;
- _tmp1_ = dmap_db_count ((DMAPDb*) _tmp0_);
- g_debug ("dpapview.vala:31: %lld entries\n", _tmp1_);
- _tmp2_ = self->priv->db;
- dmap_db_foreach ((DMAPDb*) _tmp2_, ___lambda4__gh_func, self);
+ g_debug ("%" G_GINT64_FORMAT " entries\n", dmap_db_count ((DMAPDb*) _tmp0_));
+ _tmp1_ = self->priv->db;
+ dmap_db_foreach ((DMAPDb*) _tmp1_, ___lambda4__gh_func, self);
result = TRUE;
return result;
}
-
-static gboolean _dpap_viewer_connected_cb_dmap_connection_callback (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self) {
+static gboolean
+_dpap_viewer_connected_cb_dmap_connection_callback (DMAPConnection* connection,
+ gboolean _result_,
+ const gchar* reason,
+ gpointer self)
+{
gboolean result;
result = dpap_viewer_connected_cb ((DPAPViewer*) self, connection, _result_, reason);
return result;
}
-
-static void dpap_viewer_service_added_cb (DPAPViewer* self, DMAPMdnsBrowserService* service) {
- DMAPMdnsBrowserService* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- DMAPMdnsBrowserService* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- DMAPMdnsBrowserService* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
- ValaDMAPDb* _tmp6_ = NULL;
- ValaDPAPRecordFactory* _tmp7_ = NULL;
- DPAPConnection* _tmp8_ = NULL;
- DMAPConnection* _tmp9_ = NULL;
+static void
+dpap_viewer_service_added_cb (DPAPViewer* self,
+ DMAPMdnsBrowserService* service)
+{
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ ValaDMAPDb* _tmp2_;
+ ValaDPAPRecordFactory* _tmp3_;
+ DPAPConnection* _tmp4_;
+ DMAPConnection* _tmp5_;
g_return_if_fail (self != NULL);
- _tmp0_ = service;
- _tmp1_ = _tmp0_->service_name;
- _tmp2_ = service;
- _tmp3_ = _tmp2_->host;
- _tmp4_ = service;
- _tmp5_ = _tmp4_->port;
- _tmp6_ = self->priv->db;
- _tmp7_ = self->priv->factory;
- _tmp8_ = dpap_connection_new (_tmp1_, _tmp3_, _tmp5_, (DMAPDb*) _tmp6_, (DMAPRecordFactory*) _tmp7_);
+ _tmp0_ = service->service_name;
+ _tmp1_ = service->host;
+ _tmp2_ = self->priv->db;
+ _tmp3_ = self->priv->factory;
+ _tmp4_ = dpap_connection_new (_tmp0_, _tmp1_, service->port, (DMAPDb*) _tmp2_, (DMAPRecordFactory*)
_tmp3_);
_g_object_unref0 (self->priv->connection);
- self->priv->connection = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, DMAP_TYPE_CONNECTION, DMAPConnection);
- _tmp9_ = self->priv->connection;
- dmap_connection_connect (_tmp9_, _dpap_viewer_connected_cb_dmap_connection_callback, self);
+ self->priv->connection = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, DMAP_TYPE_CONNECTION, DMAPConnection);
+ _tmp5_ = self->priv->connection;
+ dmap_connection_connect (_tmp5_, _dpap_viewer_connected_cb_dmap_connection_callback, self);
}
-
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
return self ? g_object_ref (self) : NULL;
}
-
-static void _dpap_viewer_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, void*
service, gpointer self) {
+static void
+_dpap_viewer_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender,
+ void* service,
+ gpointer self)
+{
dpap_viewer_service_added_cb ((DPAPViewer*) self, service);
}
-
-DPAPViewer* dpap_viewer_construct (GType object_type, GtkBuilder* builder, GError** error) {
+DPAPViewer*
+dpap_viewer_construct (GType object_type,
+ GtkBuilder* builder,
+ GError** error)
+{
DPAPViewer* self = NULL;
- GtkBuilder* _tmp0_ = NULL;
GtkWidget* widget = NULL;
- GtkBuilder* _tmp1_ = NULL;
- GObject* _tmp2_ = NULL;
- GtkWidget* _tmp3_ = NULL;
+ GObject* _tmp0_;
+ GtkWidget* _tmp1_;
GtkIconView* iconview = NULL;
- GtkBuilder* _tmp4_ = NULL;
- GObject* _tmp5_ = NULL;
- GtkIconView* _tmp6_ = NULL;
- GtkBuilder* _tmp7_ = NULL;
- GObject* _tmp8_ = NULL;
- GtkListStore* _tmp9_ = NULL;
- ValaDMAPDb* _tmp10_ = NULL;
- ValaDPAPRecordFactory* _tmp11_ = NULL;
- DMAPMdnsBrowser* _tmp12_ = NULL;
- DMAPMdnsBrowser* _tmp13_ = NULL;
- DMAPMdnsBrowser* _tmp14_ = NULL;
- GError * _inner_error_ = NULL;
+ GObject* _tmp2_;
+ GtkIconView* _tmp3_;
+ GObject* _tmp4_;
+ GtkListStore* _tmp5_;
+ ValaDMAPDb* _tmp6_;
+ ValaDPAPRecordFactory* _tmp7_;
+ DMAPMdnsBrowser* _tmp8_;
+ DMAPMdnsBrowser* _tmp9_;
+ DMAPMdnsBrowser* _tmp10_;
+ GError* _inner_error0_ = NULL;
g_return_val_if_fail (builder != NULL, NULL);
self = (DPAPViewer*) g_type_create_instance (object_type);
- _tmp0_ = builder;
- gtk_builder_connect_signals (_tmp0_, self);
- _tmp1_ = builder;
- _tmp2_ = gtk_builder_get_object (_tmp1_, "window");
- _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, GTK_TYPE_WIDGET) ? ((GtkWidget*) _tmp2_)
: NULL);
- widget = _tmp3_;
- _tmp4_ = builder;
- _tmp5_ = gtk_builder_get_object (_tmp4_, "iconview");
- _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, GTK_TYPE_ICON_VIEW) ? ((GtkIconView*)
_tmp5_) : NULL);
- iconview = _tmp6_;
- _tmp7_ = builder;
- _tmp8_ = gtk_builder_get_object (_tmp7_, "liststore");
- _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, GTK_TYPE_LIST_STORE) ? ((GtkListStore*)
_tmp8_) : NULL);
+ gtk_builder_connect_signals (builder, self);
+ _tmp0_ = gtk_builder_get_object (builder, "window");
+ _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, GTK_TYPE_WIDGET) ? ((GtkWidget*) _tmp0_)
: NULL);
+ widget = _tmp1_;
+ _tmp2_ = gtk_builder_get_object (builder, "iconview");
+ _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, GTK_TYPE_ICON_VIEW) ? ((GtkIconView*)
_tmp2_) : NULL);
+ iconview = _tmp3_;
+ _tmp4_ = gtk_builder_get_object (builder, "liststore");
+ _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, GTK_TYPE_LIST_STORE) ? ((GtkListStore*)
_tmp4_) : NULL);
_g_object_unref0 (self->priv->liststore);
- self->priv->liststore = _tmp9_;
- _tmp10_ = vala_dmap_db_new ();
+ self->priv->liststore = _tmp5_;
+ _tmp6_ = vala_dmap_db_new ();
_g_object_unref0 (self->priv->db);
- self->priv->db = _tmp10_;
- _tmp11_ = vala_dpap_record_factory_new ();
+ self->priv->db = _tmp6_;
+ _tmp7_ = vala_dpap_record_factory_new ();
_g_object_unref0 (self->priv->factory);
- self->priv->factory = _tmp11_;
+ self->priv->factory = _tmp7_;
gtk_icon_view_set_pixbuf_column (iconview, 0);
gtk_icon_view_set_text_column (iconview, 1);
gtk_widget_show_all (widget);
- _tmp12_ = dmap_mdns_browser_new (DMAP_MDNS_BROWSER_SERVICE_TYPE_DPAP);
+ _tmp8_ = dmap_mdns_browser_new (DMAP_MDNS_BROWSER_SERVICE_TYPE_DPAP);
_g_object_unref0 (self->priv->browser);
- self->priv->browser = _tmp12_;
- _tmp13_ = self->priv->browser;
- g_signal_connect (_tmp13_, "service-added", (GCallback)
_dpap_viewer_service_added_cb_dmap_mdns_browser_service_added, self);
- _tmp14_ = self->priv->browser;
- dmap_mdns_browser_start (_tmp14_, &_inner_error_);
- if (G_UNLIKELY (_inner_error_ != NULL)) {
- g_propagate_error (error, _inner_error_);
+ self->priv->browser = _tmp8_;
+ _tmp9_ = self->priv->browser;
+ g_signal_connect (_tmp9_, "service-added", (GCallback)
_dpap_viewer_service_added_cb_dmap_mdns_browser_service_added, self);
+ _tmp10_ = self->priv->browser;
+ dmap_mdns_browser_start (_tmp10_, &_inner_error0_);
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
+ g_propagate_error (error, _inner_error0_);
_g_object_unref0 (iconview);
_g_object_unref0 (widget);
_dpap_viewer_unref0 (self);
@@ -368,25 +394,31 @@ DPAPViewer* dpap_viewer_construct (GType object_type, GtkBuilder* builder, GErro
return self;
}
-
-DPAPViewer* dpap_viewer_new (GtkBuilder* builder, GError** error) {
+DPAPViewer*
+dpap_viewer_new (GtkBuilder* builder,
+ GError** error)
+{
return dpap_viewer_construct (TYPE_DPAP_VIEWER, builder, error);
}
-
-static void value_dpap_viewer_init (GValue* value) {
+static void
+value_dpap_viewer_init (GValue* value)
+{
value->data[0].v_pointer = NULL;
}
-
-static void value_dpap_viewer_free_value (GValue* value) {
+static void
+value_dpap_viewer_free_value (GValue* value)
+{
if (value->data[0].v_pointer) {
dpap_viewer_unref (value->data[0].v_pointer);
}
}
-
-static void value_dpap_viewer_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_dpap_viewer_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
if (src_value->data[0].v_pointer) {
dest_value->data[0].v_pointer = dpap_viewer_ref (src_value->data[0].v_pointer);
} else {
@@ -394,15 +426,20 @@ static void value_dpap_viewer_copy_value (const GValue* src_value, GValue* dest_
}
}
-
-static gpointer value_dpap_viewer_peek_pointer (const GValue* value) {
+static gpointer
+value_dpap_viewer_peek_pointer (const GValue* value)
+{
return value->data[0].v_pointer;
}
-
-static gchar* value_dpap_viewer_collect_value (GValue* value, guint n_collect_values, GTypeCValue*
collect_values, guint collect_flags) {
+static gchar*
+value_dpap_viewer_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
if (collect_values[0].v_pointer) {
- DPAPViewer* object;
+ DPAPViewer * object;
object = collect_values[0].v_pointer;
if (object->parent_instance.g_class == NULL) {
return g_strconcat ("invalid unclassed object pointer for value type `",
G_VALUE_TYPE_NAME (value), "'", NULL);
@@ -416,9 +453,13 @@ static gchar* value_dpap_viewer_collect_value (GValue* value, guint n_collect_va
return NULL;
}
-
-static gchar* value_dpap_viewer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue*
collect_values, guint collect_flags) {
- DPAPViewer** object_p;
+static gchar*
+value_dpap_viewer_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
+ DPAPViewer ** object_p;
object_p = collect_values[0].v_pointer;
if (!object_p) {
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
@@ -433,8 +474,13 @@ static gchar* value_dpap_viewer_lcopy_value (const GValue* value, guint n_collec
return NULL;
}
-
-GParamSpec* param_spec_dpap_viewer (const gchar* name, const gchar* nick, const gchar* blurb, GType
object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_dpap_viewer (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
ParamSpecDPAPViewer* spec;
g_return_val_if_fail (g_type_is_a (object_type, TYPE_DPAP_VIEWER), NULL);
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
@@ -442,15 +488,18 @@ GParamSpec* param_spec_dpap_viewer (const gchar* name, const gchar* nick, const
return G_PARAM_SPEC (spec);
}
-
-gpointer value_get_dpap_viewer (const GValue* value) {
+gpointer
+value_get_dpap_viewer (const GValue* value)
+{
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_VIEWER), NULL);
return value->data[0].v_pointer;
}
-
-void value_set_dpap_viewer (GValue* value, gpointer v_object) {
- DPAPViewer* old;
+void
+value_set_dpap_viewer (GValue* value,
+ gpointer v_object)
+{
+ DPAPViewer * old;
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_VIEWER));
old = value->data[0].v_pointer;
if (v_object) {
@@ -466,9 +515,11 @@ void value_set_dpap_viewer (GValue* value, gpointer v_object) {
}
}
-
-void value_take_dpap_viewer (GValue* value, gpointer v_object) {
- DPAPViewer* old;
+void
+value_take_dpap_viewer (GValue* value,
+ gpointer v_object)
+{
+ DPAPViewer * old;
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_VIEWER));
old = value->data[0].v_pointer;
if (v_object) {
@@ -483,21 +534,26 @@ void value_take_dpap_viewer (GValue* value, gpointer v_object) {
}
}
-
-static void dpap_viewer_class_init (DPAPViewerClass * klass) {
+static void
+dpap_viewer_class_init (DPAPViewerClass * klass,
+ gpointer klass_data)
+{
dpap_viewer_parent_class = g_type_class_peek_parent (klass);
((DPAPViewerClass *) klass)->finalize = dpap_viewer_finalize;
- g_type_class_add_private (klass, sizeof (DPAPViewerPrivate));
+ g_type_class_adjust_private_offset (klass, &DPAPViewer_private_offset);
}
-
-static void dpap_viewer_instance_init (DPAPViewer * self) {
- self->priv = DPAP_VIEWER_GET_PRIVATE (self);
+static void
+dpap_viewer_instance_init (DPAPViewer * self,
+ gpointer klass)
+{
+ self->priv = dpap_viewer_get_instance_private (self);
self->ref_count = 1;
}
-
-static void dpap_viewer_finalize (DPAPViewer* obj) {
+static void
+dpap_viewer_finalize (DPAPViewer * obj)
+{
DPAPViewer * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DPAP_VIEWER, DPAPViewer);
g_signal_handlers_destroy (self);
@@ -508,31 +564,43 @@ static void dpap_viewer_finalize (DPAPViewer* obj) {
_g_object_unref0 (self->priv->factory);
}
+static GType
+dpap_viewer_get_type_once (void)
+{
+ static const GTypeValueTable g_define_type_value_table = { value_dpap_viewer_init,
value_dpap_viewer_free_value, value_dpap_viewer_copy_value, value_dpap_viewer_peek_pointer, "p",
value_dpap_viewer_collect_value, "p", value_dpap_viewer_lcopy_value };
+ static const GTypeInfo g_define_type_info = { sizeof (DPAPViewerClass), (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GClassInitFunc) dpap_viewer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof
(DPAPViewer), 0, (GInstanceInitFunc) dpap_viewer_instance_init, &g_define_type_value_table };
+ static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED |
G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+ GType dpap_viewer_type_id;
+ dpap_viewer_type_id = g_type_register_fundamental (g_type_fundamental_next (), "DPAPViewer",
&g_define_type_info, &g_define_type_fundamental_info, 0);
+ DPAPViewer_private_offset = g_type_add_instance_private (dpap_viewer_type_id, sizeof
(DPAPViewerPrivate));
+ return dpap_viewer_type_id;
+}
-GType dpap_viewer_get_type (void) {
+GType
+dpap_viewer_get_type (void)
+{
static volatile gsize dpap_viewer_type_id__volatile = 0;
if (g_once_init_enter (&dpap_viewer_type_id__volatile)) {
- static const GTypeValueTable g_define_type_value_table = { value_dpap_viewer_init,
value_dpap_viewer_free_value, value_dpap_viewer_copy_value, value_dpap_viewer_peek_pointer, "p",
value_dpap_viewer_collect_value, "p", value_dpap_viewer_lcopy_value };
- static const GTypeInfo g_define_type_info = { sizeof (DPAPViewerClass), (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GClassInitFunc) dpap_viewer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof
(DPAPViewer), 0, (GInstanceInitFunc) dpap_viewer_instance_init, &g_define_type_value_table };
- static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED |
G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
GType dpap_viewer_type_id;
- dpap_viewer_type_id = g_type_register_fundamental (g_type_fundamental_next (), "DPAPViewer",
&g_define_type_info, &g_define_type_fundamental_info, 0);
+ dpap_viewer_type_id = dpap_viewer_get_type_once ();
g_once_init_leave (&dpap_viewer_type_id__volatile, dpap_viewer_type_id);
}
return dpap_viewer_type_id__volatile;
}
-
-gpointer dpap_viewer_ref (gpointer instance) {
- DPAPViewer* self;
+gpointer
+dpap_viewer_ref (gpointer instance)
+{
+ DPAPViewer * self;
self = instance;
g_atomic_int_inc (&self->ref_count);
return instance;
}
-
-void dpap_viewer_unref (gpointer instance) {
- DPAPViewer* self;
+void
+dpap_viewer_unref (gpointer instance)
+{
+ DPAPViewer * self;
self = instance;
if (g_atomic_int_dec_and_test (&self->ref_count)) {
DPAP_VIEWER_GET_CLASS (self)->finalize (self);
@@ -540,30 +608,32 @@ void dpap_viewer_unref (gpointer instance) {
}
}
-
-gint _vala_main (gchar** args, int args_length1) {
+gint
+_vala_main (gchar** args,
+ gint args_length1)
+{
+ GError* _inner_error0_ = NULL;
gint result = 0;
- GError * _inner_error_ = NULL;
- gtk_init (&args_length1, &args);
+ gtk_init ((gint*) (&args_length1), &args);
{
GtkBuilder* builder = NULL;
- GtkBuilder* _tmp0_ = NULL;
- GtkBuilder* _tmp1_ = NULL;
+ GtkBuilder* _tmp0_;
+ GtkBuilder* _tmp1_;
DPAPViewer* dpapviewer = NULL;
- GtkBuilder* _tmp2_ = NULL;
- DPAPViewer* _tmp3_ = NULL;
+ GtkBuilder* _tmp2_;
+ DPAPViewer* _tmp3_;
_tmp0_ = gtk_builder_new ();
builder = _tmp0_;
_tmp1_ = builder;
- gtk_builder_add_from_file (_tmp1_, "tests/dpapview.ui", &_inner_error_);
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ gtk_builder_add_from_file (_tmp1_, "tests/dpapview.ui", &_inner_error0_);
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
_g_object_unref0 (builder);
goto __catch0_g_error;
}
_tmp2_ = builder;
- _tmp3_ = dpap_viewer_new (_tmp2_, &_inner_error_);
+ _tmp3_ = dpap_viewer_new (_tmp2_, &_inner_error0_);
dpapviewer = _tmp3_;
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
_g_object_unref0 (builder);
goto __catch0_g_error;
}
@@ -575,11 +645,11 @@ gint _vala_main (gchar** args, int args_length1) {
__catch0_g_error:
{
GError* e = NULL;
- FILE* _tmp4_ = NULL;
- GError* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- e = _inner_error_;
- _inner_error_ = NULL;
+ FILE* _tmp4_;
+ GError* _tmp5_;
+ const gchar* _tmp6_;
+ e = _inner_error0_;
+ _inner_error0_ = NULL;
_tmp4_ = stderr;
_tmp5_ = e;
_tmp6_ = _tmp5_->message;
@@ -589,22 +659,20 @@ gint _vala_main (gchar** args, int args_length1) {
return result;
}
__finally0:
- if (G_UNLIKELY (_inner_error_ != NULL)) {
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
- g_clear_error (&_inner_error_);
- return 0;
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
+ gint _tmp7_ = -1;
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error0_->message, g_quark_to_string (_inner_error0_->domain), _inner_error0_->code);
+ g_clear_error (&_inner_error0_);
+ return _tmp7_;
}
result = 0;
return result;
}
-
-int main (int argc, char ** argv) {
-#if !GLIB_CHECK_VERSION (2,35,0)
- g_type_init ();
-#endif
+int
+main (int argc,
+ char ** argv)
+{
return _vala_main (argv, argc);
}
-
-
diff --git a/tests/test-dmap-client.c b/tests/test-dmap-client.c
index e127bd6..ea18737 100644
--- a/tests/test-dmap-client.c
+++ b/tests/test-dmap-client.c
@@ -23,10 +23,10 @@
#include <string.h>
#include <libdmapsharing/dmap.h>
+#include <libdmapsharing/test-daap-record-factory.h>
+#include <libdmapsharing/test-dpap-record-factory.h>
#include "test-dmap-db.h"
-#include "test-daap-record-factory.h"
-#include "test-dpap-record-factory.h"
enum {
DAAP,
diff --git a/tests/test-dmap-server.c b/tests/test-dmap-server.c
index b773b3c..b67910f 100644
--- a/tests/test-dmap-server.c
+++ b/tests/test-dmap-server.c
@@ -24,12 +24,12 @@
#include <glib.h>
#include <libdmapsharing/dmap.h>
+#include <libdmapsharing/test-daap-record.h>
+#include <libdmapsharing/test-daap-record-factory.h>
+#include <libdmapsharing/test-dpap-record.h>
+#include <libdmapsharing/test-dpap-record-factory.h>
#include "test-dmap-container-record.h"
-#include "test-daap-record.h"
-#include "test-daap-record-factory.h"
-#include "test-dpap-record.h"
-#include "test-dpap-record-factory.h"
#include "test-dmap-container-db.h"
#include "test-dmap-db.h"
diff --git a/tests/vala-dmap-container-db.c b/tests/vala-dmap-container-db.c
index b9bd776..2d252e0 100644
--- a/tests/vala-dmap-container-db.c
+++ b/tests/vala-dmap-container-db.c
@@ -1,4 +1,4 @@
-/* vala-dmap-container-db.c generated by valac 0.27.2, the Vala compiler
+/* vala-dmap-container-db.c generated by valac 0.48.6, the Vala compiler
* generated from vala-dmap-container-db.vala, do not modify */
/* FILE: vala-dmap-db.vala -- A DMAPContainerDb implementation in Vala
@@ -23,11 +23,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <glib.h>
#include <glib-object.h>
#include <libdmapsharing/dmap.h>
#include <gee.h>
-
+#include <glib.h>
#define TYPE_VALA_DMAP_CONTAINER_DB (vala_dmap_container_db_get_type ())
#define VALA_DMAP_CONTAINER_DB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VALA_DMAP_CONTAINER_DB,
ValaDMAPContainerDb))
@@ -39,6 +38,11 @@
typedef struct _ValaDMAPContainerDb ValaDMAPContainerDb;
typedef struct _ValaDMAPContainerDbClass ValaDMAPContainerDbClass;
typedef struct _ValaDMAPContainerDbPrivate ValaDMAPContainerDbPrivate;
+enum {
+ VALA_DMAP_CONTAINER_DB_0_PROPERTY,
+ VALA_DMAP_CONTAINER_DB_NUM_PROPERTIES
+};
+static GParamSpec* vala_dmap_container_db_properties[VALA_DMAP_CONTAINER_DB_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
struct _ValaDMAPContainerDb {
@@ -54,40 +58,52 @@ struct _ValaDMAPContainerDbPrivate {
GeeArrayList* db;
};
-
+static gint ValaDMAPContainerDb_private_offset;
static gpointer vala_dmap_container_db_parent_class = NULL;
-static DMAPContainerDbIface* vala_dmap_container_db_dmap_container_db_parent_iface = NULL;
+static DMAPContainerDbIface * vala_dmap_container_db_dmap_container_db_parent_iface = NULL;
GType vala_dmap_container_db_get_type (void) G_GNUC_CONST;
-#define VALA_DMAP_CONTAINER_DB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
TYPE_VALA_DMAP_CONTAINER_DB, ValaDMAPContainerDbPrivate))
-enum {
- VALA_DMAP_CONTAINER_DB_DUMMY_PROPERTY
-};
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDMAPContainerDb, g_object_unref)
static gint64 vala_dmap_container_db_real_count (DMAPContainerDb* base);
-static void vala_dmap_container_db_real_foreach (DMAPContainerDb* base, GHFunc func, void* func_target);
-static DMAPContainerRecord* vala_dmap_container_db_real_lookup_by_id (DMAPContainerDb* base, guint id);
-static void vala_dmap_container_db_real_add (DMAPContainerDb* base, DMAPContainerRecord* record);
+static void vala_dmap_container_db_real_foreach (DMAPContainerDb* base,
+ GHFunc func,
+ gpointer func_target);
+static DMAPContainerRecord* vala_dmap_container_db_real_lookup_by_id (DMAPContainerDb* base,
+ guint id);
+static void vala_dmap_container_db_real_add (DMAPContainerDb* base,
+ DMAPContainerRecord* record);
ValaDMAPContainerDb* vala_dmap_container_db_new (void);
ValaDMAPContainerDb* vala_dmap_container_db_construct (GType object_type);
-static void vala_dmap_container_db_finalize (GObject* obj);
+static void vala_dmap_container_db_finalize (GObject * obj);
+static GType vala_dmap_container_db_get_type_once (void);
+static inline gpointer
+vala_dmap_container_db_get_instance_private (ValaDMAPContainerDb* self)
+{
+ return G_STRUCT_MEMBER_P (self, ValaDMAPContainerDb_private_offset);
+}
-static gint64 vala_dmap_container_db_real_count (DMAPContainerDb* base) {
+static gint64
+vala_dmap_container_db_real_count (DMAPContainerDb* base)
+{
ValaDMAPContainerDb * self;
+ GeeArrayList* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
gint64 result = 0LL;
- GeeArrayList* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
self = (ValaDMAPContainerDb*) base;
_tmp0_ = self->priv->db;
- _tmp1_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp0_);
+ _tmp1_ = gee_abstract_collection_get_size ((GeeAbstractCollection*) _tmp0_);
_tmp2_ = _tmp1_;
result = (gint64) _tmp2_;
return result;
}
-
-static void vala_dmap_container_db_real_foreach (DMAPContainerDb* base, GHFunc func, void* func_target) {
+static void
+vala_dmap_container_db_real_foreach (DMAPContainerDb* base,
+ GHFunc func,
+ gpointer func_target)
+{
ValaDMAPContainerDb * self;
gint i = 0;
self = (ValaDMAPContainerDb*) base;
@@ -96,116 +112,125 @@ static void vala_dmap_container_db_real_foreach (DMAPContainerDb* base, GHFunc f
i = 0;
_tmp0_ = TRUE;
while (TRUE) {
- gint _tmp2_ = 0;
- GeeArrayList* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
- GHFunc _tmp6_ = NULL;
- void* _tmp6__target = NULL;
- gint _tmp7_ = 0;
- void* _tmp8_ = NULL;
- GeeArrayList* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gpointer _tmp11_ = NULL;
+ GeeArrayList* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ void* _tmp5_;
+ GeeArrayList* _tmp6_;
+ gpointer _tmp7_;
if (!_tmp0_) {
- gint _tmp1_ = 0;
+ gint _tmp1_;
_tmp1_ = i;
i = _tmp1_ + 1;
}
_tmp0_ = FALSE;
- _tmp2_ = i;
- _tmp3_ = self->priv->db;
- _tmp4_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp3_);
- _tmp5_ = _tmp4_;
- if (!(_tmp2_ < _tmp5_)) {
+ _tmp2_ = self->priv->db;
+ _tmp3_ = gee_abstract_collection_get_size ((GeeAbstractCollection*) _tmp2_);
+ _tmp4_ = _tmp3_;
+ if (!(i < _tmp4_)) {
break;
}
- _tmp6_ = func;
- _tmp6__target = func_target;
- _tmp7_ = i;
- _tmp8_ = GINT_TO_POINTER (_tmp7_);
- _tmp9_ = self->priv->db;
- _tmp10_ = i;
- _tmp11_ = gee_abstract_list_get ((GeeAbstractList*) _tmp9_, _tmp10_);
- _tmp6_ (_tmp8_, (DMAPRecord*) _tmp11_, _tmp6__target);
+ _tmp5_ = GINT_TO_POINTER (i);
+ _tmp6_ = self->priv->db;
+ _tmp7_ = gee_abstract_list_get ((GeeAbstractList*) _tmp6_, i);
+ func (_tmp5_, (DMAPRecord*) _tmp7_, func_target);
}
}
}
-
-static DMAPContainerRecord* vala_dmap_container_db_real_lookup_by_id (DMAPContainerDb* base, guint id) {
+static DMAPContainerRecord*
+vala_dmap_container_db_real_lookup_by_id (DMAPContainerDb* base,
+ guint id)
+{
ValaDMAPContainerDb * self;
- DMAPContainerRecord* result = NULL;
self = (ValaDMAPContainerDb*) base;
g_error ("vala-dmap-container-db.vala:41: lookup_by_id not implemented");
- return result;
}
-
-static void vala_dmap_container_db_real_add (DMAPContainerDb* base, DMAPContainerRecord* record) {
+static void
+vala_dmap_container_db_real_add (DMAPContainerDb* base,
+ DMAPContainerRecord* record)
+{
ValaDMAPContainerDb * self;
self = (ValaDMAPContainerDb*) base;
g_return_if_fail (record != NULL);
g_error ("vala-dmap-container-db.vala:45: add not implemented");
}
-
-ValaDMAPContainerDb* vala_dmap_container_db_construct (GType object_type) {
+ValaDMAPContainerDb*
+vala_dmap_container_db_construct (GType object_type)
+{
ValaDMAPContainerDb * self = NULL;
self = (ValaDMAPContainerDb*) g_object_new (object_type, NULL);
return self;
}
-
-ValaDMAPContainerDb* vala_dmap_container_db_new (void) {
+ValaDMAPContainerDb*
+vala_dmap_container_db_new (void)
+{
return vala_dmap_container_db_construct (TYPE_VALA_DMAP_CONTAINER_DB);
}
-
-static void vala_dmap_container_db_class_init (ValaDMAPContainerDbClass * klass) {
+static void
+vala_dmap_container_db_class_init (ValaDMAPContainerDbClass * klass,
+ gpointer klass_data)
+{
vala_dmap_container_db_parent_class = g_type_class_peek_parent (klass);
- g_type_class_add_private (klass, sizeof (ValaDMAPContainerDbPrivate));
+ g_type_class_adjust_private_offset (klass, &ValaDMAPContainerDb_private_offset);
G_OBJECT_CLASS (klass)->finalize = vala_dmap_container_db_finalize;
}
-
-static void vala_dmap_container_db_dmap_container_db_interface_init (DMAPContainerDbIface * iface) {
+static void
+vala_dmap_container_db_dmap_container_db_interface_init (DMAPContainerDbIface * iface,
+ gpointer iface_data)
+{
vala_dmap_container_db_dmap_container_db_parent_iface = g_type_interface_peek_parent (iface);
- iface->count = (gint64 (*)(DMAPContainerDb*)) vala_dmap_container_db_real_count;
- iface->foreach = (void (*)(DMAPContainerDb*, GHFunc, void*)) vala_dmap_container_db_real_foreach;
- iface->lookup_by_id = (DMAPContainerRecord* (*)(DMAPContainerDb*, guint))
vala_dmap_container_db_real_lookup_by_id;
- iface->add = (void (*)(DMAPContainerDb*, DMAPContainerRecord*)) vala_dmap_container_db_real_add;
+ iface->count = (gint64 (*) (DMAPContainerDb*)) vala_dmap_container_db_real_count;
+ iface->foreach = (void (*) (DMAPContainerDb*, GHFunc, gpointer)) vala_dmap_container_db_real_foreach;
+ iface->lookup_by_id = (DMAPContainerRecord* (*) (DMAPContainerDb*, guint))
vala_dmap_container_db_real_lookup_by_id;
+ iface->add = (void (*) (DMAPContainerDb*, DMAPContainerRecord*)) vala_dmap_container_db_real_add;
}
-
-static void vala_dmap_container_db_instance_init (ValaDMAPContainerDb * self) {
- GeeArrayList* _tmp0_ = NULL;
- self->priv = VALA_DMAP_CONTAINER_DB_GET_PRIVATE (self);
- _tmp0_ = gee_array_list_new (DMAP_TYPE_RECORD, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL,
NULL, NULL);
+static void
+vala_dmap_container_db_instance_init (ValaDMAPContainerDb * self,
+ gpointer klass)
+{
+ GeeArrayList* _tmp0_;
+ self->priv = vala_dmap_container_db_get_instance_private (self);
+ _tmp0_ = gee_array_list_new (DMAP_TYPE_RECORD, NULL, NULL, NULL, NULL, NULL);
self->priv->db = _tmp0_;
}
-
-static void vala_dmap_container_db_finalize (GObject* obj) {
+static void
+vala_dmap_container_db_finalize (GObject * obj)
+{
ValaDMAPContainerDb * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VALA_DMAP_CONTAINER_DB, ValaDMAPContainerDb);
_g_object_unref0 (self->priv->db);
G_OBJECT_CLASS (vala_dmap_container_db_parent_class)->finalize (obj);
}
+static GType
+vala_dmap_container_db_get_type_once (void)
+{
+ static const GTypeInfo g_define_type_info = { sizeof (ValaDMAPContainerDbClass), (GBaseInitFunc)
NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) vala_dmap_container_db_class_init, (GClassFinalizeFunc)
NULL, NULL, sizeof (ValaDMAPContainerDb), 0, (GInstanceInitFunc) vala_dmap_container_db_instance_init, NULL };
+ static const GInterfaceInfo dmap_container_db_info = { (GInterfaceInitFunc)
vala_dmap_container_db_dmap_container_db_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+ GType vala_dmap_container_db_type_id;
+ vala_dmap_container_db_type_id = g_type_register_static (G_TYPE_OBJECT, "ValaDMAPContainerDb",
&g_define_type_info, 0);
+ g_type_add_interface_static (vala_dmap_container_db_type_id, DMAP_TYPE_CONTAINER_DB,
&dmap_container_db_info);
+ ValaDMAPContainerDb_private_offset = g_type_add_instance_private (vala_dmap_container_db_type_id,
sizeof (ValaDMAPContainerDbPrivate));
+ return vala_dmap_container_db_type_id;
+}
-GType vala_dmap_container_db_get_type (void) {
+GType
+vala_dmap_container_db_get_type (void)
+{
static volatile gsize vala_dmap_container_db_type_id__volatile = 0;
if (g_once_init_enter (&vala_dmap_container_db_type_id__volatile)) {
- static const GTypeInfo g_define_type_info = { sizeof (ValaDMAPContainerDbClass),
(GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) vala_dmap_container_db_class_init,
(GClassFinalizeFunc) NULL, NULL, sizeof (ValaDMAPContainerDb), 0, (GInstanceInitFunc)
vala_dmap_container_db_instance_init, NULL };
- static const GInterfaceInfo dmap_container_db_info = { (GInterfaceInitFunc)
vala_dmap_container_db_dmap_container_db_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
GType vala_dmap_container_db_type_id;
- vala_dmap_container_db_type_id = g_type_register_static (G_TYPE_OBJECT,
"ValaDMAPContainerDb", &g_define_type_info, 0);
- g_type_add_interface_static (vala_dmap_container_db_type_id, DMAP_TYPE_CONTAINER_DB,
&dmap_container_db_info);
+ vala_dmap_container_db_type_id = vala_dmap_container_db_get_type_once ();
g_once_init_leave (&vala_dmap_container_db_type_id__volatile, vala_dmap_container_db_type_id);
}
return vala_dmap_container_db_type_id__volatile;
}
-
-
diff --git a/tests/vala-dmap-container-db.vala b/tests/vala-dmap-container-db.vala
index 7571e39..8aee03d 100644
--- a/tests/vala-dmap-container-db.vala
+++ b/tests/vala-dmap-container-db.vala
@@ -24,7 +24,7 @@ private class ValaDMAPContainerDb : GLib.Object, DMAP.ContainerDb {
// A dumb database that stores everything in an array
/* FIXME: What is with this unowned? */
- private Gee.ArrayList<unowned DMAP.Record> db = new Gee.ArrayList<DMAP.Record> ();
+ private Gee.ArrayList<unowned DMAP.Record> db = new Gee.ArrayList<unowned DMAP.Record> ();
public int64 count () {
return db.size;
diff --git a/tests/vala-dmap-db.c b/tests/vala-dmap-db.c
index 03923a0..617392a 100644
--- a/tests/vala-dmap-db.c
+++ b/tests/vala-dmap-db.c
@@ -1,4 +1,4 @@
-/* vala-dmap-db.c generated by valac 0.27.2, the Vala compiler
+/* vala-dmap-db.c generated by valac 0.48.6, the Vala compiler
* generated from vala-dmap-db.vala, do not modify */
/* FILE: vala-dmap-db.vala -- A DMAPDb implementation in Vala
@@ -23,14 +23,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <glib.h>
#include <glib-object.h>
#include <libdmapsharing/dmap.h>
#include <gee.h>
+#include <glib.h>
#include <stdlib.h>
#include <string.h>
-
#define TYPE_VALA_DMAP_DB (vala_dmap_db_get_type ())
#define VALA_DMAP_DB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VALA_DMAP_DB, ValaDMAPDb))
#define VALA_DMAP_DB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VALA_DMAP_DB, ValaDMAPDbClass))
@@ -41,6 +40,11 @@
typedef struct _ValaDMAPDb ValaDMAPDb;
typedef struct _ValaDMAPDbClass ValaDMAPDbClass;
typedef struct _ValaDMAPDbPrivate ValaDMAPDbPrivate;
+enum {
+ VALA_DMAP_DB_0_PROPERTY,
+ VALA_DMAP_DB_NUM_PROPERTIES
+};
+static GParamSpec* vala_dmap_db_properties[VALA_DMAP_DB_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
struct _ValaDMAPDb {
@@ -56,84 +60,101 @@ struct _ValaDMAPDbPrivate {
GeeArrayList* db;
};
-
+static gint ValaDMAPDb_private_offset;
static gpointer vala_dmap_db_parent_class = NULL;
-static DMAPDbIface* vala_dmap_db_dmap_db_parent_iface = NULL;
+static DMAPDbIface * vala_dmap_db_dmap_db_parent_iface = NULL;
GType vala_dmap_db_get_type (void) G_GNUC_CONST;
-#define VALA_DMAP_DB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VALA_DMAP_DB, ValaDMAPDbPrivate))
-enum {
- VALA_DMAP_DB_DUMMY_PROPERTY
-};
-static guint vala_dmap_db_real_add (DMAPDb* base, DMAPRecord* record);
-static guint vala_dmap_db_real_add_path (DMAPDb* base, const gchar* path);
-static guint vala_dmap_db_real_add_with_id (DMAPDb* base, DMAPRecord* record, guint id);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDMAPDb, g_object_unref)
+static guint vala_dmap_db_real_add (DMAPDb* base,
+ DMAPRecord* record);
+static guint vala_dmap_db_real_add_path (DMAPDb* base,
+ const gchar* path);
+static guint vala_dmap_db_real_add_with_id (DMAPDb* base,
+ DMAPRecord* record,
+ guint id);
static gint64 vala_dmap_db_real_count (DMAPDb* base);
-static void vala_dmap_db_real_foreach (DMAPDb* base, GHFunc func, void* func_target);
-static DMAPRecord* vala_dmap_db_real_lookup_by_id (DMAPDb* base, guint id);
-static guint vala_dmap_db_real_lookup_id_by_location (DMAPDb* base, const gchar* location);
+static void vala_dmap_db_real_foreach (DMAPDb* base,
+ GHFunc func,
+ gpointer func_target);
+static DMAPRecord* vala_dmap_db_real_lookup_by_id (DMAPDb* base,
+ guint id);
+static guint vala_dmap_db_real_lookup_id_by_location (DMAPDb* base,
+ const gchar* location);
ValaDMAPDb* vala_dmap_db_new (void);
ValaDMAPDb* vala_dmap_db_construct (GType object_type);
-static void vala_dmap_db_finalize (GObject* obj);
+static void vala_dmap_db_finalize (GObject * obj);
+static GType vala_dmap_db_get_type_once (void);
+static inline gpointer
+vala_dmap_db_get_instance_private (ValaDMAPDb* self)
+{
+ return G_STRUCT_MEMBER_P (self, ValaDMAPDb_private_offset);
+}
-static guint vala_dmap_db_real_add (DMAPDb* base, DMAPRecord* record) {
+static guint
+vala_dmap_db_real_add (DMAPDb* base,
+ DMAPRecord* record)
+{
ValaDMAPDb * self;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
guint result = 0U;
- GeeArrayList* _tmp0_ = NULL;
- DMAPRecord* _tmp1_ = NULL;
- GeeArrayList* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
self = (ValaDMAPDb*) base;
g_return_val_if_fail (record != NULL, 0U);
_tmp0_ = self->priv->db;
- _tmp1_ = record;
- gee_abstract_collection_add ((GeeAbstractCollection*) _tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_,
DMAP_TYPE_RECORD, DMAPRecord));
- _tmp2_ = self->priv->db;
- _tmp3_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp2_);
- _tmp4_ = _tmp3_;
- result = (guint) _tmp4_;
+ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp0_, G_TYPE_CHECK_INSTANCE_CAST (record,
DMAP_TYPE_RECORD, DMAPRecord));
+ _tmp1_ = self->priv->db;
+ _tmp2_ = gee_abstract_collection_get_size ((GeeAbstractCollection*) _tmp1_);
+ _tmp3_ = _tmp2_;
+ result = (guint) _tmp3_;
return result;
}
-
-static guint vala_dmap_db_real_add_path (DMAPDb* base, const gchar* path) {
+static guint
+vala_dmap_db_real_add_path (DMAPDb* base,
+ const gchar* path)
+{
ValaDMAPDb * self;
- guint result = 0U;
self = (ValaDMAPDb*) base;
g_return_val_if_fail (path != NULL, 0U);
g_error ("vala-dmap-db.vala:35: add_path not implemented");
- return result;
}
-
-static guint vala_dmap_db_real_add_with_id (DMAPDb* base, DMAPRecord* record, guint id) {
+static guint
+vala_dmap_db_real_add_with_id (DMAPDb* base,
+ DMAPRecord* record,
+ guint id)
+{
ValaDMAPDb * self;
- guint result = 0U;
self = (ValaDMAPDb*) base;
g_return_val_if_fail (record != NULL, 0U);
g_error ("vala-dmap-db.vala:39: add_with_id not implemented");
- return result;
}
-
-static gint64 vala_dmap_db_real_count (DMAPDb* base) {
+static gint64
+vala_dmap_db_real_count (DMAPDb* base)
+{
ValaDMAPDb * self;
+ GeeArrayList* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
gint64 result = 0LL;
- GeeArrayList* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
self = (ValaDMAPDb*) base;
_tmp0_ = self->priv->db;
- _tmp1_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp0_);
+ _tmp1_ = gee_abstract_collection_get_size ((GeeAbstractCollection*) _tmp0_);
_tmp2_ = _tmp1_;
result = (gint64) _tmp2_;
return result;
}
-
-static void vala_dmap_db_real_foreach (DMAPDb* base, GHFunc func, void* func_target) {
+static void
+vala_dmap_db_real_foreach (DMAPDb* base,
+ GHFunc func,
+ gpointer func_target)
+{
ValaDMAPDb * self;
gint i = 0;
self = (ValaDMAPDb*) base;
@@ -142,127 +163,134 @@ static void vala_dmap_db_real_foreach (DMAPDb* base, GHFunc func, void* func_tar
i = 0;
_tmp0_ = TRUE;
while (TRUE) {
- gint _tmp2_ = 0;
- GeeArrayList* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
- GHFunc _tmp6_ = NULL;
- void* _tmp6__target = NULL;
- gint _tmp7_ = 0;
- void* _tmp8_ = NULL;
- GeeArrayList* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gpointer _tmp11_ = NULL;
+ GeeArrayList* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ void* _tmp5_;
+ GeeArrayList* _tmp6_;
+ gpointer _tmp7_;
if (!_tmp0_) {
- gint _tmp1_ = 0;
+ gint _tmp1_;
_tmp1_ = i;
i = _tmp1_ + 1;
}
_tmp0_ = FALSE;
- _tmp2_ = i;
- _tmp3_ = self->priv->db;
- _tmp4_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp3_);
- _tmp5_ = _tmp4_;
- if (!(_tmp2_ < _tmp5_)) {
+ _tmp2_ = self->priv->db;
+ _tmp3_ = gee_abstract_collection_get_size ((GeeAbstractCollection*) _tmp2_);
+ _tmp4_ = _tmp3_;
+ if (!(i < _tmp4_)) {
break;
}
- _tmp6_ = func;
- _tmp6__target = func_target;
- _tmp7_ = i;
- _tmp8_ = GINT_TO_POINTER (_tmp7_ + 1);
- _tmp9_ = self->priv->db;
- _tmp10_ = i;
- _tmp11_ = gee_abstract_list_get ((GeeAbstractList*) _tmp9_, _tmp10_);
- _tmp6_ (_tmp8_, (DMAPRecord*) _tmp11_, _tmp6__target);
+ _tmp5_ = GINT_TO_POINTER (i + 1);
+ _tmp6_ = self->priv->db;
+ _tmp7_ = gee_abstract_list_get ((GeeAbstractList*) _tmp6_, i);
+ func (_tmp5_, (DMAPRecord*) _tmp7_, func_target);
}
}
}
-
-static DMAPRecord* vala_dmap_db_real_lookup_by_id (DMAPDb* base, guint id) {
+static DMAPRecord*
+vala_dmap_db_real_lookup_by_id (DMAPDb* base,
+ guint id)
+{
ValaDMAPDb * self;
+ GeeArrayList* _tmp0_;
+ gpointer _tmp1_;
DMAPRecord* result = NULL;
- GeeArrayList* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- gpointer _tmp2_ = NULL;
self = (ValaDMAPDb*) base;
_tmp0_ = self->priv->db;
- _tmp1_ = id;
- _tmp2_ = gee_abstract_list_get ((GeeAbstractList*) _tmp0_, ((gint) _tmp1_) - 1);
- result = (DMAPRecord*) _tmp2_;
+ _tmp1_ = gee_abstract_list_get ((GeeAbstractList*) _tmp0_, ((gint) id) - 1);
+ result = (DMAPRecord*) _tmp1_;
return result;
}
-
-static guint vala_dmap_db_real_lookup_id_by_location (DMAPDb* base, const gchar* location) {
+static guint
+vala_dmap_db_real_lookup_id_by_location (DMAPDb* base,
+ const gchar* location)
+{
ValaDMAPDb * self;
- guint result = 0U;
self = (ValaDMAPDb*) base;
g_return_val_if_fail (location != NULL, 0U);
g_error ("vala-dmap-db.vala:63: lookup_id_by_location not implemented");
- return result;
}
-
-ValaDMAPDb* vala_dmap_db_construct (GType object_type) {
+ValaDMAPDb*
+vala_dmap_db_construct (GType object_type)
+{
ValaDMAPDb * self = NULL;
self = (ValaDMAPDb*) g_object_new (object_type, NULL);
return self;
}
-
-ValaDMAPDb* vala_dmap_db_new (void) {
+ValaDMAPDb*
+vala_dmap_db_new (void)
+{
return vala_dmap_db_construct (TYPE_VALA_DMAP_DB);
}
-
-static void vala_dmap_db_class_init (ValaDMAPDbClass * klass) {
+static void
+vala_dmap_db_class_init (ValaDMAPDbClass * klass,
+ gpointer klass_data)
+{
vala_dmap_db_parent_class = g_type_class_peek_parent (klass);
- g_type_class_add_private (klass, sizeof (ValaDMAPDbPrivate));
+ g_type_class_adjust_private_offset (klass, &ValaDMAPDb_private_offset);
G_OBJECT_CLASS (klass)->finalize = vala_dmap_db_finalize;
}
-
-static void vala_dmap_db_dmap_db_interface_init (DMAPDbIface * iface) {
+static void
+vala_dmap_db_dmap_db_interface_init (DMAPDbIface * iface,
+ gpointer iface_data)
+{
vala_dmap_db_dmap_db_parent_iface = g_type_interface_peek_parent (iface);
- iface->add = (guint (*)(DMAPDb*, DMAPRecord*)) vala_dmap_db_real_add;
- iface->add_path = (guint (*)(DMAPDb*, const gchar*)) vala_dmap_db_real_add_path;
- iface->add_with_id = (guint (*)(DMAPDb*, DMAPRecord*, guint)) vala_dmap_db_real_add_with_id;
- iface->count = (gint64 (*)(DMAPDb*)) vala_dmap_db_real_count;
- iface->foreach = (void (*)(DMAPDb*, GHFunc, void*)) vala_dmap_db_real_foreach;
- iface->lookup_by_id = (DMAPRecord* (*)(DMAPDb*, guint)) vala_dmap_db_real_lookup_by_id;
- iface->lookup_id_by_location = (guint (*)(DMAPDb*, const gchar*))
vala_dmap_db_real_lookup_id_by_location;
+ iface->add = (guint (*) (DMAPDb*, DMAPRecord*)) vala_dmap_db_real_add;
+ iface->add_path = (guint (*) (DMAPDb*, const gchar*)) vala_dmap_db_real_add_path;
+ iface->add_with_id = (guint (*) (DMAPDb*, DMAPRecord*, guint)) vala_dmap_db_real_add_with_id;
+ iface->count = (gint64 (*) (DMAPDb*)) vala_dmap_db_real_count;
+ iface->foreach = (void (*) (DMAPDb*, GHFunc, gpointer)) vala_dmap_db_real_foreach;
+ iface->lookup_by_id = (DMAPRecord* (*) (DMAPDb*, guint)) vala_dmap_db_real_lookup_by_id;
+ iface->lookup_id_by_location = (guint (*) (DMAPDb*, const gchar*))
vala_dmap_db_real_lookup_id_by_location;
}
-
-static void vala_dmap_db_instance_init (ValaDMAPDb * self) {
- GeeArrayList* _tmp0_ = NULL;
- self->priv = VALA_DMAP_DB_GET_PRIVATE (self);
- _tmp0_ = gee_array_list_new (DMAP_TYPE_RECORD, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL,
NULL, NULL);
+static void
+vala_dmap_db_instance_init (ValaDMAPDb * self,
+ gpointer klass)
+{
+ GeeArrayList* _tmp0_;
+ self->priv = vala_dmap_db_get_instance_private (self);
+ _tmp0_ = gee_array_list_new (DMAP_TYPE_RECORD, NULL, NULL, NULL, NULL, NULL);
self->priv->db = _tmp0_;
}
-
-static void vala_dmap_db_finalize (GObject* obj) {
+static void
+vala_dmap_db_finalize (GObject * obj)
+{
ValaDMAPDb * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VALA_DMAP_DB, ValaDMAPDb);
_g_object_unref0 (self->priv->db);
G_OBJECT_CLASS (vala_dmap_db_parent_class)->finalize (obj);
}
+static GType
+vala_dmap_db_get_type_once (void)
+{
+ static const GTypeInfo g_define_type_info = { sizeof (ValaDMAPDbClass), (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GClassInitFunc) vala_dmap_db_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof
(ValaDMAPDb), 0, (GInstanceInitFunc) vala_dmap_db_instance_init, NULL };
+ static const GInterfaceInfo dmap_db_info = { (GInterfaceInitFunc)
vala_dmap_db_dmap_db_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+ GType vala_dmap_db_type_id;
+ vala_dmap_db_type_id = g_type_register_static (G_TYPE_OBJECT, "ValaDMAPDb", &g_define_type_info, 0);
+ g_type_add_interface_static (vala_dmap_db_type_id, DMAP_TYPE_DB, &dmap_db_info);
+ ValaDMAPDb_private_offset = g_type_add_instance_private (vala_dmap_db_type_id, sizeof
(ValaDMAPDbPrivate));
+ return vala_dmap_db_type_id;
+}
-GType vala_dmap_db_get_type (void) {
+GType
+vala_dmap_db_get_type (void)
+{
static volatile gsize vala_dmap_db_type_id__volatile = 0;
if (g_once_init_enter (&vala_dmap_db_type_id__volatile)) {
- static const GTypeInfo g_define_type_info = { sizeof (ValaDMAPDbClass), (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GClassInitFunc) vala_dmap_db_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof
(ValaDMAPDb), 0, (GInstanceInitFunc) vala_dmap_db_instance_init, NULL };
- static const GInterfaceInfo dmap_db_info = { (GInterfaceInitFunc)
vala_dmap_db_dmap_db_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
GType vala_dmap_db_type_id;
- vala_dmap_db_type_id = g_type_register_static (G_TYPE_OBJECT, "ValaDMAPDb",
&g_define_type_info, 0);
- g_type_add_interface_static (vala_dmap_db_type_id, DMAP_TYPE_DB, &dmap_db_info);
+ vala_dmap_db_type_id = vala_dmap_db_get_type_once ();
g_once_init_leave (&vala_dmap_db_type_id__volatile, vala_dmap_db_type_id);
}
return vala_dmap_db_type_id__volatile;
}
-
-
diff --git a/tests/vala-dmap-db.vala b/tests/vala-dmap-db.vala
index 2d6ef0a..171f548 100644
--- a/tests/vala-dmap-db.vala
+++ b/tests/vala-dmap-db.vala
@@ -24,7 +24,7 @@ private class ValaDMAPDb : GLib.Object, DMAP.Db {
// A dumb database that stores everything in an array
/* FIXME: What is with this unowned? */
- private Gee.ArrayList<unowned DMAP.Record> db = new Gee.ArrayList<DMAP.Record> ();
+ private Gee.ArrayList<unowned DMAP.Record> db = new Gee.ArrayList<unowned DMAP.Record> ();
public uint add (DMAP.Record record) {
db.add (((DMAP.Record) record));
diff --git a/tests/vala-dpap-record.c b/tests/vala-dpap-record.c
index 004e33d..08ddca8 100644
--- a/tests/vala-dpap-record.c
+++ b/tests/vala-dpap-record.c
@@ -1,4 +1,4 @@
-/* vala-dpap-record.c generated by valac 0.27.2, the Vala compiler
+/* vala-dpap-record.c generated by valac 0.48.6, the Vala compiler
* generated from vala-dpap-record.vala, do not modify */
/* FILE: vala-dpap-record.vala -- A DPAPRecord implementation in Vala
@@ -23,15 +23,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <glib.h>
#include <glib-object.h>
#include <libdmapsharing/dmap.h>
#include <stdlib.h>
#include <string.h>
+#include <glib.h>
#include <gio/gio.h>
#include <glib/gstdio.h>
-
#define TYPE_VALA_DPAP_RECORD (vala_dpap_record_get_type ())
#define VALA_DPAP_RECORD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VALA_DPAP_RECORD, ValaDPAPRecord))
#define VALA_DPAP_RECORD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VALA_DPAP_RECORD,
ValaDPAPRecordClass))
@@ -42,6 +41,22 @@
typedef struct _ValaDPAPRecord ValaDPAPRecord;
typedef struct _ValaDPAPRecordClass ValaDPAPRecordClass;
typedef struct _ValaDPAPRecordPrivate ValaDPAPRecordPrivate;
+enum {
+ VALA_DPAP_RECORD_0_PROPERTY,
+ VALA_DPAP_RECORD_LOCATION_PROPERTY,
+ VALA_DPAP_RECORD_FILENAME_PROPERTY,
+ VALA_DPAP_RECORD_ASPECT_RATIO_PROPERTY,
+ VALA_DPAP_RECORD_FORMAT_PROPERTY,
+ VALA_DPAP_RECORD_THUMBNAIL_PROPERTY,
+ VALA_DPAP_RECORD_COMMENTS_PROPERTY,
+ VALA_DPAP_RECORD_LARGE_FILESIZE_PROPERTY,
+ VALA_DPAP_RECORD_PIXEL_HEIGHT_PROPERTY,
+ VALA_DPAP_RECORD_PIXEL_WIDTH_PROPERTY,
+ VALA_DPAP_RECORD_RATING_PROPERTY,
+ VALA_DPAP_RECORD_CREATION_DATE_PROPERTY,
+ VALA_DPAP_RECORD_NUM_PROPERTIES
+};
+static GParamSpec* vala_dpap_record_properties[VALA_DPAP_RECORD_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define _g_byte_array_unref0(var) ((var == NULL) ? NULL : (var = (g_byte_array_unref (var), NULL)))
@@ -55,6 +70,11 @@ typedef struct _ValaDPAPRecordPrivate ValaDPAPRecordPrivate;
typedef struct _ValaDPAPRecordFactory ValaDPAPRecordFactory;
typedef struct _ValaDPAPRecordFactoryClass ValaDPAPRecordFactoryClass;
typedef struct _ValaDPAPRecordFactoryPrivate ValaDPAPRecordFactoryPrivate;
+enum {
+ VALA_DPAP_RECORD_FACTORY_0_PROPERTY,
+ VALA_DPAP_RECORD_FACTORY_NUM_PROPERTIES
+};
+static GParamSpec* vala_dpap_record_factory_properties[VALA_DPAP_RECORD_FACTORY_NUM_PROPERTIES];
struct _ValaDPAPRecord {
GObject parent_instance;
@@ -88,121 +108,133 @@ struct _ValaDPAPRecordFactoryClass {
GObjectClass parent_class;
};
-
+static gint ValaDPAPRecord_private_offset;
static gpointer vala_dpap_record_parent_class = NULL;
-static DMAPRecordIface* vala_dpap_record_dmap_record_parent_iface = NULL;
-static DPAPRecordIface* vala_dpap_record_dpap_record_parent_iface = NULL;
+static DMAPRecordIface * vala_dpap_record_dmap_record_parent_iface = NULL;
+static DPAPRecordIface * vala_dpap_record_dpap_record_parent_iface = NULL;
static gpointer vala_dpap_record_factory_parent_class = NULL;
-static DMAPRecordFactoryIface* vala_dpap_record_factory_dmap_record_factory_parent_iface = NULL;
+static DMAPRecordFactoryIface * vala_dpap_record_factory_dmap_record_factory_parent_iface = NULL;
GType vala_dpap_record_get_type (void) G_GNUC_CONST;
-#define VALA_DPAP_RECORD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VALA_DPAP_RECORD,
ValaDPAPRecordPrivate))
-enum {
- VALA_DPAP_RECORD_DUMMY_PROPERTY,
- VALA_DPAP_RECORD_LOCATION,
- VALA_DPAP_RECORD_FILENAME,
- VALA_DPAP_RECORD_ASPECT_RATIO,
- VALA_DPAP_RECORD_FORMAT,
- VALA_DPAP_RECORD_THUMBNAIL,
- VALA_DPAP_RECORD_COMMENTS,
- VALA_DPAP_RECORD_LARGE_FILESIZE,
- VALA_DPAP_RECORD_PIXEL_HEIGHT,
- VALA_DPAP_RECORD_PIXEL_WIDTH,
- VALA_DPAP_RECORD_RATING,
- VALA_DPAP_RECORD_CREATION_DATE
-};
-static GInputStream* vala_dpap_record_real_read (DPAPRecord* base, GError** error);
-static gboolean vala_dpap_record_real_set_from_blob (DMAPRecord* base, GByteArray* blob);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDPAPRecord, g_object_unref)
+static GInputStream* vala_dpap_record_real_read (DPAPRecord* base,
+ GError** error);
+static gboolean vala_dpap_record_real_set_from_blob (DMAPRecord* base,
+ GByteArray* blob);
static GByteArray* vala_dpap_record_real_to_blob (DMAPRecord* base);
ValaDPAPRecord* vala_dpap_record_new (void);
ValaDPAPRecord* vala_dpap_record_construct (GType object_type);
const gchar* vala_dpap_record_get_location (ValaDPAPRecord* self);
-void vala_dpap_record_set_location (ValaDPAPRecord* self, const gchar* value);
+void vala_dpap_record_set_location (ValaDPAPRecord* self,
+ const gchar* value);
const gchar* vala_dpap_record_get_filename (ValaDPAPRecord* self);
-void vala_dpap_record_set_filename (ValaDPAPRecord* self, const gchar* value);
+void vala_dpap_record_set_filename (ValaDPAPRecord* self,
+ const gchar* value);
const gchar* vala_dpap_record_get_aspect_ratio (ValaDPAPRecord* self);
-void vala_dpap_record_set_aspect_ratio (ValaDPAPRecord* self, const gchar* value);
+void vala_dpap_record_set_aspect_ratio (ValaDPAPRecord* self,
+ const gchar* value);
const gchar* vala_dpap_record_get_format (ValaDPAPRecord* self);
-void vala_dpap_record_set_format (ValaDPAPRecord* self, const gchar* value);
+void vala_dpap_record_set_format (ValaDPAPRecord* self,
+ const gchar* value);
GByteArray* vala_dpap_record_get_thumbnail (ValaDPAPRecord* self);
-void vala_dpap_record_set_thumbnail (ValaDPAPRecord* self, GByteArray* value);
+void vala_dpap_record_set_thumbnail (ValaDPAPRecord* self,
+ GByteArray* value);
const gchar* vala_dpap_record_get_comments (ValaDPAPRecord* self);
-void vala_dpap_record_set_comments (ValaDPAPRecord* self, const gchar* value);
+void vala_dpap_record_set_comments (ValaDPAPRecord* self,
+ const gchar* value);
gint vala_dpap_record_get_large_filesize (ValaDPAPRecord* self);
-void vala_dpap_record_set_large_filesize (ValaDPAPRecord* self, gint value);
+void vala_dpap_record_set_large_filesize (ValaDPAPRecord* self,
+ gint value);
gint vala_dpap_record_get_pixel_height (ValaDPAPRecord* self);
-void vala_dpap_record_set_pixel_height (ValaDPAPRecord* self, gint value);
+void vala_dpap_record_set_pixel_height (ValaDPAPRecord* self,
+ gint value);
gint vala_dpap_record_get_pixel_width (ValaDPAPRecord* self);
-void vala_dpap_record_set_pixel_width (ValaDPAPRecord* self, gint value);
+void vala_dpap_record_set_pixel_width (ValaDPAPRecord* self,
+ gint value);
gint vala_dpap_record_get_rating (ValaDPAPRecord* self);
-void vala_dpap_record_set_rating (ValaDPAPRecord* self, gint value);
+void vala_dpap_record_set_rating (ValaDPAPRecord* self,
+ gint value);
gint vala_dpap_record_get_creation_date (ValaDPAPRecord* self);
-void vala_dpap_record_set_creation_date (ValaDPAPRecord* self, gint value);
-static void vala_dpap_record_finalize (GObject* obj);
-static void _vala_vala_dpap_record_get_property (GObject * object, guint property_id, GValue * value,
GParamSpec * pspec);
-static void _vala_vala_dpap_record_set_property (GObject * object, guint property_id, const GValue * value,
GParamSpec * pspec);
+void vala_dpap_record_set_creation_date (ValaDPAPRecord* self,
+ gint value);
+static void vala_dpap_record_finalize (GObject * obj);
+static GType vala_dpap_record_get_type_once (void);
+static void _vala_vala_dpap_record_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec);
+static void _vala_vala_dpap_record_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec);
GType vala_dpap_record_factory_get_type (void) G_GNUC_CONST;
-enum {
- VALA_DPAP_RECORD_FACTORY_DUMMY_PROPERTY
-};
-static DMAPRecord* vala_dpap_record_factory_real_create (DMAPRecordFactory* base, void* user_data);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ValaDPAPRecordFactory, g_object_unref)
+static DMAPRecord* vala_dpap_record_factory_real_create (DMAPRecordFactory* base,
+ void* user_data);
ValaDPAPRecordFactory* vala_dpap_record_factory_new (void);
ValaDPAPRecordFactory* vala_dpap_record_factory_construct (GType object_type);
+static GType vala_dpap_record_factory_get_type_once (void);
+static inline gpointer
+vala_dpap_record_get_instance_private (ValaDPAPRecord* self)
+{
+ return G_STRUCT_MEMBER_P (self, ValaDPAPRecord_private_offset);
+}
-static GInputStream* vala_dpap_record_real_read (DPAPRecord* base, GError** error) {
+static GInputStream*
+vala_dpap_record_real_read (DPAPRecord* base,
+ GError** error)
+{
ValaDPAPRecord * self;
- GInputStream* result = NULL;
self = (ValaDPAPRecord*) base;
g_error ("vala-dpap-record.vala:95: read not implemented");
- return result;
}
-
-static gboolean vala_dpap_record_real_set_from_blob (DMAPRecord* base, GByteArray* blob) {
+static gboolean
+vala_dpap_record_real_set_from_blob (DMAPRecord* base,
+ GByteArray* blob)
+{
ValaDPAPRecord * self;
- gboolean result = FALSE;
self = (ValaDPAPRecord*) base;
g_return_val_if_fail (blob != NULL, FALSE);
g_error ("vala-dpap-record.vala:99: set_from_blob not implemented");
- return result;
}
-
-static GByteArray* vala_dpap_record_real_to_blob (DMAPRecord* base) {
+static GByteArray*
+vala_dpap_record_real_to_blob (DMAPRecord* base)
+{
ValaDPAPRecord * self;
- GByteArray* result = NULL;
self = (ValaDPAPRecord*) base;
g_error ("vala-dpap-record.vala:103: to_blob not implemented");
- return result;
}
-
-ValaDPAPRecord* vala_dpap_record_construct (GType object_type) {
+ValaDPAPRecord*
+vala_dpap_record_construct (GType object_type)
+{
ValaDPAPRecord * self = NULL;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
gchar* path = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
guint8* data = NULL;
gint data_length1 = 0;
gint _data_size_ = 0;
guint8* _tmp14_ = NULL;
- size_t _tmp15_;
- GByteArray* _tmp16_ = NULL;
- GByteArray* _tmp17_ = NULL;
- GError * _inner_error_ = NULL;
+ size_t _tmp15_ = 0;
+ GByteArray* _tmp16_;
+ GByteArray* _tmp17_;
+ GError* _inner_error0_ = NULL;
self = (ValaDPAPRecord*) g_object_new (object_type, NULL);
_tmp0_ = g_get_current_dir ();
_tmp1_ = _tmp0_;
@@ -237,307 +269,318 @@ ValaDPAPRecord* vala_dpap_record_construct (GType object_type) {
_tmp13_ = _tmp12_;
_g_free0 (_tmp11_);
path = _tmp13_;
- g_file_get_contents (path, (gchar**) (&_tmp14_), &_tmp15_, &_inner_error_);
+ g_file_get_contents (path, (gchar**) (&_tmp14_), &_tmp15_, &_inner_error0_);
data = (g_free (data), NULL);
data = _tmp14_;
data_length1 = _tmp15_;
_data_size_ = data_length1;
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
data = (g_free (data), NULL);
_g_free0 (path);
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
- g_clear_error (&_inner_error_);
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error0_->message, g_quark_to_string (_inner_error0_->domain), _inner_error0_->code);
+ g_clear_error (&_inner_error0_);
return NULL;
}
_tmp16_ = g_byte_array_new ();
_g_byte_array_unref0 (self->priv->_thumbnail);
self->priv->_thumbnail = _tmp16_;
_tmp17_ = self->priv->_thumbnail;
- g_byte_array_append (_tmp17_, data, data_length1);
+ g_byte_array_append (_tmp17_, data, (gint) data_length1);
data = (g_free (data), NULL);
_g_free0 (path);
return self;
}
-
-ValaDPAPRecord* vala_dpap_record_new (void) {
+ValaDPAPRecord*
+vala_dpap_record_new (void)
+{
return vala_dpap_record_construct (TYPE_VALA_DPAP_RECORD);
}
-
-const gchar* vala_dpap_record_get_location (ValaDPAPRecord* self) {
+const gchar*
+vala_dpap_record_get_location (ValaDPAPRecord* self)
+{
const gchar* result;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
g_return_val_if_fail (self != NULL, NULL);
_tmp0_ = self->priv->_location;
result = _tmp0_;
return result;
}
-
-void vala_dpap_record_set_location (ValaDPAPRecord* self, const gchar* value) {
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+void
+vala_dpap_record_set_location (ValaDPAPRecord* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
g_return_if_fail (self != NULL);
- _tmp0_ = value;
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
_g_free0 (self->priv->_location);
- self->priv->_location = _tmp1_;
- g_object_notify ((GObject *) self, "location");
+ self->priv->_location = _tmp0_;
+ g_object_notify_by_pspec ((GObject *) self,
vala_dpap_record_properties[VALA_DPAP_RECORD_LOCATION_PROPERTY]);
}
-
-const gchar* vala_dpap_record_get_filename (ValaDPAPRecord* self) {
+const gchar*
+vala_dpap_record_get_filename (ValaDPAPRecord* self)
+{
const gchar* result;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
g_return_val_if_fail (self != NULL, NULL);
_tmp0_ = self->priv->_filename;
result = _tmp0_;
return result;
}
-
-void vala_dpap_record_set_filename (ValaDPAPRecord* self, const gchar* value) {
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+void
+vala_dpap_record_set_filename (ValaDPAPRecord* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
g_return_if_fail (self != NULL);
- _tmp0_ = value;
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
_g_free0 (self->priv->_filename);
- self->priv->_filename = _tmp1_;
- g_object_notify ((GObject *) self, "filename");
+ self->priv->_filename = _tmp0_;
+ g_object_notify_by_pspec ((GObject *) self,
vala_dpap_record_properties[VALA_DPAP_RECORD_FILENAME_PROPERTY]);
}
-
-const gchar* vala_dpap_record_get_aspect_ratio (ValaDPAPRecord* self) {
+const gchar*
+vala_dpap_record_get_aspect_ratio (ValaDPAPRecord* self)
+{
const gchar* result;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
g_return_val_if_fail (self != NULL, NULL);
_tmp0_ = self->priv->_aspect_ratio;
result = _tmp0_;
return result;
}
-
-void vala_dpap_record_set_aspect_ratio (ValaDPAPRecord* self, const gchar* value) {
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+void
+vala_dpap_record_set_aspect_ratio (ValaDPAPRecord* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
g_return_if_fail (self != NULL);
- _tmp0_ = value;
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
_g_free0 (self->priv->_aspect_ratio);
- self->priv->_aspect_ratio = _tmp1_;
- g_object_notify ((GObject *) self, "aspect-ratio");
+ self->priv->_aspect_ratio = _tmp0_;
+ g_object_notify_by_pspec ((GObject *) self,
vala_dpap_record_properties[VALA_DPAP_RECORD_ASPECT_RATIO_PROPERTY]);
}
-
-const gchar* vala_dpap_record_get_format (ValaDPAPRecord* self) {
+const gchar*
+vala_dpap_record_get_format (ValaDPAPRecord* self)
+{
const gchar* result;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
g_return_val_if_fail (self != NULL, NULL);
_tmp0_ = self->priv->_format;
result = _tmp0_;
return result;
}
-
-void vala_dpap_record_set_format (ValaDPAPRecord* self, const gchar* value) {
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+void
+vala_dpap_record_set_format (ValaDPAPRecord* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
g_return_if_fail (self != NULL);
- _tmp0_ = value;
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
_g_free0 (self->priv->_format);
- self->priv->_format = _tmp1_;
- g_object_notify ((GObject *) self, "format");
+ self->priv->_format = _tmp0_;
+ g_object_notify_by_pspec ((GObject *) self,
vala_dpap_record_properties[VALA_DPAP_RECORD_FORMAT_PROPERTY]);
}
-
-GByteArray* vala_dpap_record_get_thumbnail (ValaDPAPRecord* self) {
+GByteArray*
+vala_dpap_record_get_thumbnail (ValaDPAPRecord* self)
+{
GByteArray* result;
- GByteArray* _tmp0_ = NULL;
+ GByteArray* _tmp0_;
g_return_val_if_fail (self != NULL, NULL);
_tmp0_ = self->priv->_thumbnail;
result = _tmp0_;
return result;
}
-
-void vala_dpap_record_set_thumbnail (ValaDPAPRecord* self, GByteArray* value) {
- GByteArray* _tmp0_ = NULL;
- GByteArray* _tmp1_ = NULL;
- GByteArray* _tmp2_ = NULL;
- guint8* _tmp3_ = NULL;
- gint _tmp3__length1 = 0;
+void
+vala_dpap_record_set_thumbnail (ValaDPAPRecord* self,
+ GByteArray* value)
+{
+ GByteArray* _tmp0_;
+ GByteArray* _tmp1_;
+ guint8* _tmp2_;
+ gint _tmp2__length1;
g_return_if_fail (self != NULL);
_tmp0_ = g_byte_array_new ();
_g_byte_array_unref0 (self->priv->_thumbnail);
self->priv->_thumbnail = _tmp0_;
_tmp1_ = self->priv->_thumbnail;
- _tmp2_ = value;
- _tmp3_ = _tmp2_->data;
- _tmp3__length1 = (gint) _tmp2_->len;
- g_byte_array_append (_tmp1_, _tmp3_, _tmp3__length1);
- g_object_notify ((GObject *) self, "thumbnail");
+ _tmp2_ = value->data;
+ _tmp2__length1 = value->len;
+ g_byte_array_append (_tmp1_, _tmp2_, (gint) _tmp2__length1);
+ g_object_notify_by_pspec ((GObject *) self,
vala_dpap_record_properties[VALA_DPAP_RECORD_THUMBNAIL_PROPERTY]);
}
-
-const gchar* vala_dpap_record_get_comments (ValaDPAPRecord* self) {
+const gchar*
+vala_dpap_record_get_comments (ValaDPAPRecord* self)
+{
const gchar* result;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
g_return_val_if_fail (self != NULL, NULL);
_tmp0_ = self->priv->_comments;
result = _tmp0_;
return result;
}
-
-void vala_dpap_record_set_comments (ValaDPAPRecord* self, const gchar* value) {
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+void
+vala_dpap_record_set_comments (ValaDPAPRecord* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
g_return_if_fail (self != NULL);
- _tmp0_ = value;
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
_g_free0 (self->priv->_comments);
- self->priv->_comments = _tmp1_;
- g_object_notify ((GObject *) self, "comments");
+ self->priv->_comments = _tmp0_;
+ g_object_notify_by_pspec ((GObject *) self,
vala_dpap_record_properties[VALA_DPAP_RECORD_COMMENTS_PROPERTY]);
}
-
-gint vala_dpap_record_get_large_filesize (ValaDPAPRecord* self) {
+gint
+vala_dpap_record_get_large_filesize (ValaDPAPRecord* self)
+{
gint result;
- gint _tmp0_ = 0;
g_return_val_if_fail (self != NULL, 0);
- _tmp0_ = self->priv->_large_filesize;
- result = _tmp0_;
+ result = self->priv->_large_filesize;
return result;
}
-
-void vala_dpap_record_set_large_filesize (ValaDPAPRecord* self, gint value) {
- gint _tmp0_ = 0;
+void
+vala_dpap_record_set_large_filesize (ValaDPAPRecord* self,
+ gint value)
+{
g_return_if_fail (self != NULL);
- _tmp0_ = value;
- self->priv->_large_filesize = _tmp0_;
- g_object_notify ((GObject *) self, "large-filesize");
+ self->priv->_large_filesize = value;
+ g_object_notify_by_pspec ((GObject *) self,
vala_dpap_record_properties[VALA_DPAP_RECORD_LARGE_FILESIZE_PROPERTY]);
}
-
-gint vala_dpap_record_get_pixel_height (ValaDPAPRecord* self) {
+gint
+vala_dpap_record_get_pixel_height (ValaDPAPRecord* self)
+{
gint result;
- gint _tmp0_ = 0;
g_return_val_if_fail (self != NULL, 0);
- _tmp0_ = self->priv->_pixel_height;
- result = _tmp0_;
+ result = self->priv->_pixel_height;
return result;
}
-
-void vala_dpap_record_set_pixel_height (ValaDPAPRecord* self, gint value) {
- gint _tmp0_ = 0;
+void
+vala_dpap_record_set_pixel_height (ValaDPAPRecord* self,
+ gint value)
+{
g_return_if_fail (self != NULL);
- _tmp0_ = value;
- self->priv->_pixel_height = _tmp0_;
- g_object_notify ((GObject *) self, "pixel-height");
+ self->priv->_pixel_height = value;
+ g_object_notify_by_pspec ((GObject *) self,
vala_dpap_record_properties[VALA_DPAP_RECORD_PIXEL_HEIGHT_PROPERTY]);
}
-
-gint vala_dpap_record_get_pixel_width (ValaDPAPRecord* self) {
+gint
+vala_dpap_record_get_pixel_width (ValaDPAPRecord* self)
+{
gint result;
- gint _tmp0_ = 0;
g_return_val_if_fail (self != NULL, 0);
- _tmp0_ = self->priv->_pixel_width;
- result = _tmp0_;
+ result = self->priv->_pixel_width;
return result;
}
-
-void vala_dpap_record_set_pixel_width (ValaDPAPRecord* self, gint value) {
- gint _tmp0_ = 0;
+void
+vala_dpap_record_set_pixel_width (ValaDPAPRecord* self,
+ gint value)
+{
g_return_if_fail (self != NULL);
- _tmp0_ = value;
- self->priv->_pixel_width = _tmp0_;
- g_object_notify ((GObject *) self, "pixel-width");
+ self->priv->_pixel_width = value;
+ g_object_notify_by_pspec ((GObject *) self,
vala_dpap_record_properties[VALA_DPAP_RECORD_PIXEL_WIDTH_PROPERTY]);
}
-
-gint vala_dpap_record_get_rating (ValaDPAPRecord* self) {
+gint
+vala_dpap_record_get_rating (ValaDPAPRecord* self)
+{
gint result;
- gint _tmp0_ = 0;
g_return_val_if_fail (self != NULL, 0);
- _tmp0_ = self->priv->_rating;
- result = _tmp0_;
+ result = self->priv->_rating;
return result;
}
-
-void vala_dpap_record_set_rating (ValaDPAPRecord* self, gint value) {
- gint _tmp0_ = 0;
+void
+vala_dpap_record_set_rating (ValaDPAPRecord* self,
+ gint value)
+{
g_return_if_fail (self != NULL);
- _tmp0_ = value;
- self->priv->_rating = _tmp0_;
- g_object_notify ((GObject *) self, "rating");
+ self->priv->_rating = value;
+ g_object_notify_by_pspec ((GObject *) self,
vala_dpap_record_properties[VALA_DPAP_RECORD_RATING_PROPERTY]);
}
-
-gint vala_dpap_record_get_creation_date (ValaDPAPRecord* self) {
+gint
+vala_dpap_record_get_creation_date (ValaDPAPRecord* self)
+{
gint result;
- gint _tmp0_ = 0;
g_return_val_if_fail (self != NULL, 0);
- _tmp0_ = self->priv->_creation_date;
- result = _tmp0_;
+ result = self->priv->_creation_date;
return result;
}
-
-void vala_dpap_record_set_creation_date (ValaDPAPRecord* self, gint value) {
- gint _tmp0_ = 0;
+void
+vala_dpap_record_set_creation_date (ValaDPAPRecord* self,
+ gint value)
+{
g_return_if_fail (self != NULL);
- _tmp0_ = value;
- self->priv->_creation_date = _tmp0_;
- g_object_notify ((GObject *) self, "creation-date");
+ self->priv->_creation_date = value;
+ g_object_notify_by_pspec ((GObject *) self,
vala_dpap_record_properties[VALA_DPAP_RECORD_CREATION_DATE_PROPERTY]);
}
-
-static void vala_dpap_record_class_init (ValaDPAPRecordClass * klass) {
+static void
+vala_dpap_record_class_init (ValaDPAPRecordClass * klass,
+ gpointer klass_data)
+{
vala_dpap_record_parent_class = g_type_class_peek_parent (klass);
- g_type_class_add_private (klass, sizeof (ValaDPAPRecordPrivate));
+ g_type_class_adjust_private_offset (klass, &ValaDPAPRecord_private_offset);
G_OBJECT_CLASS (klass)->get_property = _vala_vala_dpap_record_get_property;
G_OBJECT_CLASS (klass)->set_property = _vala_vala_dpap_record_set_property;
G_OBJECT_CLASS (klass)->finalize = vala_dpap_record_finalize;
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_LOCATION,
g_param_spec_string ("location", "location", "location", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_FILENAME,
g_param_spec_string ("filename", "filename", "filename", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_ASPECT_RATIO,
g_param_spec_string ("aspect-ratio", "aspect-ratio", "aspect-ratio", NULL, G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_FORMAT, g_param_spec_string
("format", "format", "format", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB |
G_PARAM_READABLE | G_PARAM_WRITABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_THUMBNAIL,
g_param_spec_boxed ("thumbnail", "thumbnail", "thumbnail", G_TYPE_BYTE_ARRAY, G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_COMMENTS,
g_param_spec_string ("comments", "comments", "comments", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_LARGE_FILESIZE,
g_param_spec_int ("large-filesize", "large-filesize", "large-filesize", G_MININT, G_MAXINT, 0,
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_PIXEL_HEIGHT,
g_param_spec_int ("pixel-height", "pixel-height", "pixel-height", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME
| G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_PIXEL_WIDTH,
g_param_spec_int ("pixel-width", "pixel-width", "pixel-width", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_RATING, g_param_spec_int
("rating", "rating", "rating", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_CREATION_DATE,
g_param_spec_int ("creation-date", "creation-date", "creation-date", G_MININT, G_MAXINT, 0,
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-}
-
-
-static void vala_dpap_record_dmap_record_interface_init (DMAPRecordIface * iface) {
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_LOCATION_PROPERTY,
vala_dpap_record_properties[VALA_DPAP_RECORD_LOCATION_PROPERTY] = g_param_spec_string ("location",
"location", "location", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_FILENAME_PROPERTY,
vala_dpap_record_properties[VALA_DPAP_RECORD_FILENAME_PROPERTY] = g_param_spec_string ("filename",
"filename", "filename", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_ASPECT_RATIO_PROPERTY,
vala_dpap_record_properties[VALA_DPAP_RECORD_ASPECT_RATIO_PROPERTY] = g_param_spec_string ("aspect-ratio",
"aspect-ratio", "aspect-ratio", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_FORMAT_PROPERTY,
vala_dpap_record_properties[VALA_DPAP_RECORD_FORMAT_PROPERTY] = g_param_spec_string ("format", "format",
"format", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_THUMBNAIL_PROPERTY,
vala_dpap_record_properties[VALA_DPAP_RECORD_THUMBNAIL_PROPERTY] = g_param_spec_boxed ("thumbnail",
"thumbnail", "thumbnail", G_TYPE_BYTE_ARRAY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_COMMENTS_PROPERTY,
vala_dpap_record_properties[VALA_DPAP_RECORD_COMMENTS_PROPERTY] = g_param_spec_string ("comments",
"comments", "comments", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_LARGE_FILESIZE_PROPERTY,
vala_dpap_record_properties[VALA_DPAP_RECORD_LARGE_FILESIZE_PROPERTY] = g_param_spec_int ("large-filesize",
"large-filesize", "large-filesize", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE |
G_PARAM_WRITABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_PIXEL_HEIGHT_PROPERTY,
vala_dpap_record_properties[VALA_DPAP_RECORD_PIXEL_HEIGHT_PROPERTY] = g_param_spec_int ("pixel-height",
"pixel-height", "pixel-height", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE |
G_PARAM_WRITABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_PIXEL_WIDTH_PROPERTY,
vala_dpap_record_properties[VALA_DPAP_RECORD_PIXEL_WIDTH_PROPERTY] = g_param_spec_int ("pixel-width",
"pixel-width", "pixel-width", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE |
G_PARAM_WRITABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_RATING_PROPERTY,
vala_dpap_record_properties[VALA_DPAP_RECORD_RATING_PROPERTY] = g_param_spec_int ("rating", "rating",
"rating", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_CREATION_DATE_PROPERTY,
vala_dpap_record_properties[VALA_DPAP_RECORD_CREATION_DATE_PROPERTY] = g_param_spec_int ("creation-date",
"creation-date", "creation-date", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE |
G_PARAM_WRITABLE));
+}
+
+static void
+vala_dpap_record_dmap_record_interface_init (DMAPRecordIface * iface,
+ gpointer iface_data)
+{
vala_dpap_record_dmap_record_parent_iface = g_type_interface_peek_parent (iface);
- iface->set_from_blob = (gboolean (*)(DMAPRecord*, GByteArray*)) vala_dpap_record_real_set_from_blob;
- iface->to_blob = (GByteArray* (*)(DMAPRecord*)) vala_dpap_record_real_to_blob;
+ iface->set_from_blob = (gboolean (*) (DMAPRecord*, GByteArray*)) vala_dpap_record_real_set_from_blob;
+ iface->to_blob = (GByteArray* (*) (DMAPRecord*)) vala_dpap_record_real_to_blob;
}
-
-static void vala_dpap_record_dpap_record_interface_init (DPAPRecordIface * iface) {
+static void
+vala_dpap_record_dpap_record_interface_init (DPAPRecordIface * iface,
+ gpointer iface_data)
+{
vala_dpap_record_dpap_record_parent_iface = g_type_interface_peek_parent (iface);
- iface->read = (GInputStream* (*)(DPAPRecord*, GError**)) vala_dpap_record_real_read;
+ iface->read = (GInputStream* (*) (DPAPRecord*, GError**)) vala_dpap_record_real_read;
}
-
-static void vala_dpap_record_instance_init (ValaDPAPRecord * self) {
- self->priv = VALA_DPAP_RECORD_GET_PRIVATE (self);
+static void
+vala_dpap_record_instance_init (ValaDPAPRecord * self,
+ gpointer klass)
+{
+ self->priv = vala_dpap_record_get_instance_private (self);
}
-
-static void vala_dpap_record_finalize (GObject* obj) {
+static void
+vala_dpap_record_finalize (GObject * obj)
+{
ValaDPAPRecord * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VALA_DPAP_RECORD, ValaDPAPRecord);
_g_free0 (self->priv->_location);
@@ -549,58 +592,72 @@ static void vala_dpap_record_finalize (GObject* obj) {
G_OBJECT_CLASS (vala_dpap_record_parent_class)->finalize (obj);
}
+static GType
+vala_dpap_record_get_type_once (void)
+{
+ static const GTypeInfo g_define_type_info = { sizeof (ValaDPAPRecordClass), (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GClassInitFunc) vala_dpap_record_class_init, (GClassFinalizeFunc) NULL, NULL,
sizeof (ValaDPAPRecord), 0, (GInstanceInitFunc) vala_dpap_record_instance_init, NULL };
+ static const GInterfaceInfo dmap_record_info = { (GInterfaceInitFunc)
vala_dpap_record_dmap_record_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+ static const GInterfaceInfo dpap_record_info = { (GInterfaceInitFunc)
vala_dpap_record_dpap_record_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+ GType vala_dpap_record_type_id;
+ vala_dpap_record_type_id = g_type_register_static (G_TYPE_OBJECT, "ValaDPAPRecord",
&g_define_type_info, 0);
+ g_type_add_interface_static (vala_dpap_record_type_id, DMAP_TYPE_RECORD, &dmap_record_info);
+ g_type_add_interface_static (vala_dpap_record_type_id, DPAP_TYPE_RECORD, &dpap_record_info);
+ ValaDPAPRecord_private_offset = g_type_add_instance_private (vala_dpap_record_type_id, sizeof
(ValaDPAPRecordPrivate));
+ return vala_dpap_record_type_id;
+}
-GType vala_dpap_record_get_type (void) {
+GType
+vala_dpap_record_get_type (void)
+{
static volatile gsize vala_dpap_record_type_id__volatile = 0;
if (g_once_init_enter (&vala_dpap_record_type_id__volatile)) {
- static const GTypeInfo g_define_type_info = { sizeof (ValaDPAPRecordClass), (GBaseInitFunc)
NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) vala_dpap_record_class_init, (GClassFinalizeFunc) NULL,
NULL, sizeof (ValaDPAPRecord), 0, (GInstanceInitFunc) vala_dpap_record_instance_init, NULL };
- static const GInterfaceInfo dmap_record_info = { (GInterfaceInitFunc)
vala_dpap_record_dmap_record_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
- static const GInterfaceInfo dpap_record_info = { (GInterfaceInitFunc)
vala_dpap_record_dpap_record_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
GType vala_dpap_record_type_id;
- vala_dpap_record_type_id = g_type_register_static (G_TYPE_OBJECT, "ValaDPAPRecord",
&g_define_type_info, 0);
- g_type_add_interface_static (vala_dpap_record_type_id, DMAP_TYPE_RECORD, &dmap_record_info);
- g_type_add_interface_static (vala_dpap_record_type_id, DPAP_TYPE_RECORD, &dpap_record_info);
+ vala_dpap_record_type_id = vala_dpap_record_get_type_once ();
g_once_init_leave (&vala_dpap_record_type_id__volatile, vala_dpap_record_type_id);
}
return vala_dpap_record_type_id__volatile;
}
-
-static void _vala_vala_dpap_record_get_property (GObject * object, guint property_id, GValue * value,
GParamSpec * pspec) {
+static void
+_vala_vala_dpap_record_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec)
+{
ValaDPAPRecord * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_VALA_DPAP_RECORD, ValaDPAPRecord);
switch (property_id) {
- case VALA_DPAP_RECORD_LOCATION:
+ case VALA_DPAP_RECORD_LOCATION_PROPERTY:
g_value_set_string (value, vala_dpap_record_get_location (self));
break;
- case VALA_DPAP_RECORD_FILENAME:
+ case VALA_DPAP_RECORD_FILENAME_PROPERTY:
g_value_set_string (value, vala_dpap_record_get_filename (self));
break;
- case VALA_DPAP_RECORD_ASPECT_RATIO:
+ case VALA_DPAP_RECORD_ASPECT_RATIO_PROPERTY:
g_value_set_string (value, vala_dpap_record_get_aspect_ratio (self));
break;
- case VALA_DPAP_RECORD_FORMAT:
+ case VALA_DPAP_RECORD_FORMAT_PROPERTY:
g_value_set_string (value, vala_dpap_record_get_format (self));
break;
- case VALA_DPAP_RECORD_THUMBNAIL:
+ case VALA_DPAP_RECORD_THUMBNAIL_PROPERTY:
g_value_set_boxed (value, vala_dpap_record_get_thumbnail (self));
break;
- case VALA_DPAP_RECORD_COMMENTS:
+ case VALA_DPAP_RECORD_COMMENTS_PROPERTY:
g_value_set_string (value, vala_dpap_record_get_comments (self));
break;
- case VALA_DPAP_RECORD_LARGE_FILESIZE:
+ case VALA_DPAP_RECORD_LARGE_FILESIZE_PROPERTY:
g_value_set_int (value, vala_dpap_record_get_large_filesize (self));
break;
- case VALA_DPAP_RECORD_PIXEL_HEIGHT:
+ case VALA_DPAP_RECORD_PIXEL_HEIGHT_PROPERTY:
g_value_set_int (value, vala_dpap_record_get_pixel_height (self));
break;
- case VALA_DPAP_RECORD_PIXEL_WIDTH:
+ case VALA_DPAP_RECORD_PIXEL_WIDTH_PROPERTY:
g_value_set_int (value, vala_dpap_record_get_pixel_width (self));
break;
- case VALA_DPAP_RECORD_RATING:
+ case VALA_DPAP_RECORD_RATING_PROPERTY:
g_value_set_int (value, vala_dpap_record_get_rating (self));
break;
- case VALA_DPAP_RECORD_CREATION_DATE:
+ case VALA_DPAP_RECORD_CREATION_DATE_PROPERTY:
g_value_set_int (value, vala_dpap_record_get_creation_date (self));
break;
default:
@@ -609,42 +666,46 @@ static void _vala_vala_dpap_record_get_property (GObject * object, guint propert
}
}
-
-static void _vala_vala_dpap_record_set_property (GObject * object, guint property_id, const GValue * value,
GParamSpec * pspec) {
+static void
+_vala_vala_dpap_record_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec)
+{
ValaDPAPRecord * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_VALA_DPAP_RECORD, ValaDPAPRecord);
switch (property_id) {
- case VALA_DPAP_RECORD_LOCATION:
+ case VALA_DPAP_RECORD_LOCATION_PROPERTY:
vala_dpap_record_set_location (self, g_value_get_string (value));
break;
- case VALA_DPAP_RECORD_FILENAME:
+ case VALA_DPAP_RECORD_FILENAME_PROPERTY:
vala_dpap_record_set_filename (self, g_value_get_string (value));
break;
- case VALA_DPAP_RECORD_ASPECT_RATIO:
+ case VALA_DPAP_RECORD_ASPECT_RATIO_PROPERTY:
vala_dpap_record_set_aspect_ratio (self, g_value_get_string (value));
break;
- case VALA_DPAP_RECORD_FORMAT:
+ case VALA_DPAP_RECORD_FORMAT_PROPERTY:
vala_dpap_record_set_format (self, g_value_get_string (value));
break;
- case VALA_DPAP_RECORD_THUMBNAIL:
+ case VALA_DPAP_RECORD_THUMBNAIL_PROPERTY:
vala_dpap_record_set_thumbnail (self, g_value_get_boxed (value));
break;
- case VALA_DPAP_RECORD_COMMENTS:
+ case VALA_DPAP_RECORD_COMMENTS_PROPERTY:
vala_dpap_record_set_comments (self, g_value_get_string (value));
break;
- case VALA_DPAP_RECORD_LARGE_FILESIZE:
+ case VALA_DPAP_RECORD_LARGE_FILESIZE_PROPERTY:
vala_dpap_record_set_large_filesize (self, g_value_get_int (value));
break;
- case VALA_DPAP_RECORD_PIXEL_HEIGHT:
+ case VALA_DPAP_RECORD_PIXEL_HEIGHT_PROPERTY:
vala_dpap_record_set_pixel_height (self, g_value_get_int (value));
break;
- case VALA_DPAP_RECORD_PIXEL_WIDTH:
+ case VALA_DPAP_RECORD_PIXEL_WIDTH_PROPERTY:
vala_dpap_record_set_pixel_width (self, g_value_get_int (value));
break;
- case VALA_DPAP_RECORD_RATING:
+ case VALA_DPAP_RECORD_RATING_PROPERTY:
vala_dpap_record_set_rating (self, g_value_get_int (value));
break;
- case VALA_DPAP_RECORD_CREATION_DATE:
+ case VALA_DPAP_RECORD_CREATION_DATE_PROPERTY:
vala_dpap_record_set_creation_date (self, g_value_get_int (value));
break;
default:
@@ -653,57 +714,74 @@ static void _vala_vala_dpap_record_set_property (GObject * object, guint propert
}
}
-
-static DMAPRecord* vala_dpap_record_factory_real_create (DMAPRecordFactory* base, void* user_data) {
+static DMAPRecord*
+vala_dpap_record_factory_real_create (DMAPRecordFactory* base,
+ void* user_data)
+{
ValaDPAPRecordFactory * self;
+ ValaDPAPRecord* _tmp0_;
DMAPRecord* result = NULL;
- ValaDPAPRecord* _tmp0_ = NULL;
self = (ValaDPAPRecordFactory*) base;
_tmp0_ = vala_dpap_record_new ();
result = (DMAPRecord*) _tmp0_;
return result;
}
-
-ValaDPAPRecordFactory* vala_dpap_record_factory_construct (GType object_type) {
+ValaDPAPRecordFactory*
+vala_dpap_record_factory_construct (GType object_type)
+{
ValaDPAPRecordFactory * self = NULL;
self = (ValaDPAPRecordFactory*) g_object_new (object_type, NULL);
return self;
}
-
-ValaDPAPRecordFactory* vala_dpap_record_factory_new (void) {
+ValaDPAPRecordFactory*
+vala_dpap_record_factory_new (void)
+{
return vala_dpap_record_factory_construct (TYPE_VALA_DPAP_RECORD_FACTORY);
}
-
-static void vala_dpap_record_factory_class_init (ValaDPAPRecordFactoryClass * klass) {
+static void
+vala_dpap_record_factory_class_init (ValaDPAPRecordFactoryClass * klass,
+ gpointer klass_data)
+{
vala_dpap_record_factory_parent_class = g_type_class_peek_parent (klass);
}
-
-static void vala_dpap_record_factory_dmap_record_factory_interface_init (DMAPRecordFactoryIface * iface) {
+static void
+vala_dpap_record_factory_dmap_record_factory_interface_init (DMAPRecordFactoryIface * iface,
+ gpointer iface_data)
+{
vala_dpap_record_factory_dmap_record_factory_parent_iface = g_type_interface_peek_parent (iface);
- iface->create = (DMAPRecord* (*)(DMAPRecordFactory*, void*)) vala_dpap_record_factory_real_create;
+ iface->create = (DMAPRecord* (*) (DMAPRecordFactory*, void*)) vala_dpap_record_factory_real_create;
}
-
-static void vala_dpap_record_factory_instance_init (ValaDPAPRecordFactory * self) {
+static void
+vala_dpap_record_factory_instance_init (ValaDPAPRecordFactory * self,
+ gpointer klass)
+{
}
+static GType
+vala_dpap_record_factory_get_type_once (void)
+{
+ static const GTypeInfo g_define_type_info = { sizeof (ValaDPAPRecordFactoryClass), (GBaseInitFunc)
NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) vala_dpap_record_factory_class_init, (GClassFinalizeFunc)
NULL, NULL, sizeof (ValaDPAPRecordFactory), 0, (GInstanceInitFunc) vala_dpap_record_factory_instance_init,
NULL };
+ static const GInterfaceInfo dmap_record_factory_info = { (GInterfaceInitFunc)
vala_dpap_record_factory_dmap_record_factory_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+ GType vala_dpap_record_factory_type_id;
+ vala_dpap_record_factory_type_id = g_type_register_static (G_TYPE_OBJECT, "ValaDPAPRecordFactory",
&g_define_type_info, 0);
+ g_type_add_interface_static (vala_dpap_record_factory_type_id, DMAP_TYPE_RECORD_FACTORY,
&dmap_record_factory_info);
+ return vala_dpap_record_factory_type_id;
+}
-GType vala_dpap_record_factory_get_type (void) {
+GType
+vala_dpap_record_factory_get_type (void)
+{
static volatile gsize vala_dpap_record_factory_type_id__volatile = 0;
if (g_once_init_enter (&vala_dpap_record_factory_type_id__volatile)) {
- static const GTypeInfo g_define_type_info = { sizeof (ValaDPAPRecordFactoryClass),
(GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) vala_dpap_record_factory_class_init,
(GClassFinalizeFunc) NULL, NULL, sizeof (ValaDPAPRecordFactory), 0, (GInstanceInitFunc)
vala_dpap_record_factory_instance_init, NULL };
- static const GInterfaceInfo dmap_record_factory_info = { (GInterfaceInitFunc)
vala_dpap_record_factory_dmap_record_factory_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
GType vala_dpap_record_factory_type_id;
- vala_dpap_record_factory_type_id = g_type_register_static (G_TYPE_OBJECT,
"ValaDPAPRecordFactory", &g_define_type_info, 0);
- g_type_add_interface_static (vala_dpap_record_factory_type_id, DMAP_TYPE_RECORD_FACTORY,
&dmap_record_factory_info);
+ vala_dpap_record_factory_type_id = vala_dpap_record_factory_get_type_once ();
g_once_init_leave (&vala_dpap_record_factory_type_id__volatile,
vala_dpap_record_factory_type_id);
}
return vala_dpap_record_factory_type_id__volatile;
}
-
-
diff --git a/vala/libdmapsharing-3.0.vapi b/vala/libdmapsharing-3.0.vapi
index 32ebe7a..faa2f57 100644
--- a/vala/libdmapsharing-3.0.vapi
+++ b/vala/libdmapsharing-3.0.vapi
@@ -247,6 +247,18 @@ namespace DAAP {
public Share (string name, string password, DMAP.Db db, DMAP.ContainerDb container_db, string
transcode_mimetype);
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ public class TestDAAPRecord : GLib.Object, DAAP.Record, DAAP.DMAPRecord {
+ [CCode (cname = "test_daap_record_new", has_construct_function = false, type =
"TestDAAPRecord*")]
+ public TestDAAPRecord ();
+ [NoAccessorMethod]
+ public string real_format { owned get; set; }
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ public class TestDAAPRecordFactory : GLib.Object, DMAP.RecordFactory {
+ [CCode (cname = "test_daap_record_factory_new", has_construct_function = false, type =
"TestDAAPRecordFactory*")]
+ public TestDAAPRecordFactory ();
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
public class bitwise {
}
@@ -571,28 +583,26 @@ namespace DAAP {
public static void dmap_hash_progressive_to_string (uint digest, string str);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_update")]
public static void dmap_hash_progressive_update (DAAP.DMAPHashContext context, uint buffer, uint
length);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_BOOLEAN__STRING")]
- public static void dmap_marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__STRING")]
- public static void dmap_marshal_STRING__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__ULONG_ULONG")]
- public static void dmap_marshal_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_ULONG__VOID")]
- public static void dmap_marshal_ULONG__VOID (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_BOOLEAN")]
- public static void dmap_marshal_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
- public static void dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure closure,
GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_STRING")]
- public static void dmap_marshal_VOID__STRING_STRING (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__ULONG_FLOAT")]
- public static void dmap_marshal_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_BOOLEAN__STRING")]
+ public static void dmap_marshal_generated_BOOLEAN__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_STRING__STRING")]
+ public static void dmap_marshal_generated_STRING__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_STRING__ULONG_ULONG")]
+ public static void dmap_marshal_generated_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_ULONG__VOID")]
+ public static void dmap_marshal_generated_ULONG__VOID (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_BOOLEAN")]
+ public static void dmap_marshal_generated_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
+ public static void dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure
closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_STRING")]
+ public static void dmap_marshal_generated_VOID__STRING_STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__ULONG_FLOAT")]
+ public static void dmap_marshal_generated_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_get_client")]
public static unowned Avahi.Client dmap_mdns_avahi_get_client ();
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_set_entry_group")]
public static void dmap_mdns_avahi_set_entry_group (Avahi.EntryGroup group);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mime_to_format")]
- public static unowned string dmap_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_add")]
public static unowned GLib.Node dmap_structure_add (GLib.Node parent, DAAP.DMAPContentCode cc);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_destroy")]
@@ -611,6 +621,8 @@ namespace DAAP {
public static void dmap_structure_print (GLib.Node structure);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_serialize")]
public static unowned string dmap_structure_serialize (GLib.Node structure, uint length);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_utils_mime_to_format")]
+ public static unowned string dmap_utils_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_write_next_chunk")]
public static void dmap_write_next_chunk (Soup.Message message, DAAP.ChunkData cd);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmapd_input_stream_strdup_format_extension")]
@@ -890,6 +902,18 @@ namespace DACP {
public virtual signal void remote_paired (string service_name, bool connected);
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ public class TestDAAPRecord : GLib.Object, DAAP.Record, DACP.DMAPRecord {
+ [CCode (cname = "test_daap_record_new", has_construct_function = false, type =
"TestDAAPRecord*")]
+ public TestDAAPRecord ();
+ [NoAccessorMethod]
+ public string real_format { owned get; set; }
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ public class TestDAAPRecordFactory : GLib.Object, DACP.DMAPRecordFactory {
+ [CCode (cname = "test_daap_record_factory_new", has_construct_function = false, type =
"TestDAAPRecordFactory*")]
+ public TestDAAPRecordFactory ();
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
public class bitwise {
}
@@ -1238,28 +1262,26 @@ namespace DACP {
public static void dmap_hash_progressive_to_string (uint digest, string str);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_update")]
public static void dmap_hash_progressive_update (DACP.DMAPHashContext context, uint buffer, uint
length);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_BOOLEAN__STRING")]
- public static void dmap_marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__STRING")]
- public static void dmap_marshal_STRING__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__ULONG_ULONG")]
- public static void dmap_marshal_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_ULONG__VOID")]
- public static void dmap_marshal_ULONG__VOID (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_BOOLEAN")]
- public static void dmap_marshal_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
- public static void dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure closure,
GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_STRING")]
- public static void dmap_marshal_VOID__STRING_STRING (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__ULONG_FLOAT")]
- public static void dmap_marshal_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_BOOLEAN__STRING")]
+ public static void dmap_marshal_generated_BOOLEAN__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_STRING__STRING")]
+ public static void dmap_marshal_generated_STRING__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_STRING__ULONG_ULONG")]
+ public static void dmap_marshal_generated_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_ULONG__VOID")]
+ public static void dmap_marshal_generated_ULONG__VOID (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_BOOLEAN")]
+ public static void dmap_marshal_generated_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
+ public static void dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure
closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_STRING")]
+ public static void dmap_marshal_generated_VOID__STRING_STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__ULONG_FLOAT")]
+ public static void dmap_marshal_generated_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_get_client")]
public static unowned Avahi.Client dmap_mdns_avahi_get_client ();
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_set_entry_group")]
public static void dmap_mdns_avahi_set_entry_group (Avahi.EntryGroup group);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mime_to_format")]
- public static unowned string dmap_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_add")]
public static unowned GLib.Node dmap_structure_add (GLib.Node parent, DACP.DMAPContentCode cc);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_destroy")]
@@ -1278,6 +1300,8 @@ namespace DACP {
public static void dmap_structure_print (GLib.Node structure);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_serialize")]
public static unowned string dmap_structure_serialize (GLib.Node structure, uint length);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_utils_mime_to_format")]
+ public static unowned string dmap_utils_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_write_next_chunk")]
public static void dmap_write_next_chunk (Soup.Message message, DACP.ChunkData cd);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmapd_input_stream_strdup_format_extension")]
@@ -1807,27 +1831,25 @@ namespace DMAP {
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
public static void hash_progressive_update (DMAP.HashContext context, uint buffer, uint length);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
- public static void marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ public static void marshal_generated_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
- public static void marshal_STRING__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ public static void marshal_generated_STRING__STRING (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
- public static void marshal_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ public static void marshal_generated_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
- public static void marshal_ULONG__VOID (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ public static void marshal_generated_ULONG__VOID (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
- public static void marshal_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ public static void marshal_generated_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
- public static void marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure closure,
GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
+ public static void marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure
closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
- public static void marshal_VOID__STRING_STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ public static void marshal_generated_VOID__STRING_STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
- public static void marshal_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ public static void marshal_generated_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
public static unowned Avahi.Client mdns_avahi_get_client ();
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
public static void mdns_avahi_set_entry_group (Avahi.EntryGroup group);
- [CCode (cheader_filename = "libdmapsharing/dmap.h")]
- public static unowned string mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "pads_compatible")]
public static bool pads_compatible (Gst.Pad pad1, Gst.Pad pad2);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
@@ -1849,6 +1871,8 @@ namespace DMAP {
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
public static unowned string structure_serialize (GLib.Node structure, uint length);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ public static unowned string utils_mime_to_format (string transcode_mimetype);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
public static void write_next_chunk (Soup.Message message, DMAP.ChunkData cd);
}
/* libdmapsharing-3.0-dpap.vapi generated by vapigen, do not modify. */
@@ -2100,6 +2124,16 @@ namespace DPAP {
public Share (string name, string password, void* db, void* container_db, string
transcode_mimetype);
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ public class TestDPAPRecord : GLib.Object, DPAP.Record, DPAP.DMAPRecord {
+ [CCode (cname = "test_dpap_record_new", has_construct_function = false, type =
"TestDPAPRecord*")]
+ public TestDPAPRecord ();
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ public class TestDPAPRecordFactory : GLib.Object, DMAP.RecordFactory {
+ [CCode (cname = "test_dpap_record_factory_new", has_construct_function = false, type =
"TestDPAPRecordFactory*")]
+ public TestDPAPRecordFactory ();
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
public class bitwise {
}
@@ -2422,28 +2456,26 @@ namespace DPAP {
public static void dmap_hash_progressive_to_string (uint digest, string str);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_update")]
public static void dmap_hash_progressive_update (DPAP.DMAPHashContext context, uint buffer, uint
length);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_BOOLEAN__STRING")]
- public static void dmap_marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__STRING")]
- public static void dmap_marshal_STRING__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__ULONG_ULONG")]
- public static void dmap_marshal_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_ULONG__VOID")]
- public static void dmap_marshal_ULONG__VOID (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_BOOLEAN")]
- public static void dmap_marshal_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
- public static void dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure closure,
GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_STRING")]
- public static void dmap_marshal_VOID__STRING_STRING (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__ULONG_FLOAT")]
- public static void dmap_marshal_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_BOOLEAN__STRING")]
+ public static void dmap_marshal_generated_BOOLEAN__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_STRING__STRING")]
+ public static void dmap_marshal_generated_STRING__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_STRING__ULONG_ULONG")]
+ public static void dmap_marshal_generated_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_ULONG__VOID")]
+ public static void dmap_marshal_generated_ULONG__VOID (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_BOOLEAN")]
+ public static void dmap_marshal_generated_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
+ public static void dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure
closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_STRING")]
+ public static void dmap_marshal_generated_VOID__STRING_STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__ULONG_FLOAT")]
+ public static void dmap_marshal_generated_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_get_client")]
public static unowned Avahi.Client dmap_mdns_avahi_get_client ();
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_set_entry_group")]
public static void dmap_mdns_avahi_set_entry_group (Avahi.EntryGroup group);
- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mime_to_format")]
- public static unowned string dmap_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_add")]
public static unowned GLib.Node dmap_structure_add (GLib.Node parent, DPAP.DMAPContentCode cc);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_destroy")]
@@ -2462,6 +2494,8 @@ namespace DPAP {
public static void dmap_structure_print (GLib.Node structure);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_serialize")]
public static unowned string dmap_structure_serialize (GLib.Node structure, uint length);
+ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_utils_mime_to_format")]
+ public static unowned string dmap_utils_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_write_next_chunk")]
public static void dmap_write_next_chunk (Soup.Message message, DPAP.ChunkData cd);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmapd_input_stream_strdup_format_extension")]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
