[libdmapsharing] Regenerate C from Vala using 0.44.3
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing] Regenerate C from Vala using 0.44.3
- Date: Sun, 28 Apr 2019 05:01:24 +0000 (UTC)
commit 193042f6ced24ff6d5e3933feda4612e84206109
Author: W. Michael Petullo <mike flyn org>
Date: Sun Apr 28 01:01:06 2019 -0400
Regenerate C from Vala using 0.44.3
Signed-off-by: W. Michael Petullo <mike flyn org>
tests/dacplisten.c | 225 ++++++++++++++++----------
tests/dmapcopy.c | 356 +++++++++++++++++++++++++----------------
tests/dmapserve.c | 234 +++++++++++++++++----------
tests/vala-dmap-container-db.c | 144 ++++++++++-------
4 files changed, 597 insertions(+), 362 deletions(-)
---
diff --git a/tests/dacplisten.c b/tests/dacplisten.c
index 72dbfe6..f08fa4e 100644
--- a/tests/dacplisten.c
+++ b/tests/dacplisten.c
@@ -1,4 +1,4 @@
-/* dacplisten.c generated by valac 0.38.8, the Vala compiler
+/* dacplisten.c generated by valac 0.44.3, 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))
@@ -110,24 +109,27 @@ struct _DacpListenerPrivate {
DmapControlShare* share;
};
-
static gpointer vala_dacp_player_parent_class = NULL;
static DmapControlPlayerInterface * vala_dacp_player_dmap_control_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;
static DmapAvRecord* vala_dacp_player_real_now_playing_record (DmapControlPlayer* base);
-static const gchar* vala_dacp_player_real_now_playing_artwork (DmapControlPlayer* base, guint width, guint
height);
+static const gchar* vala_dacp_player_real_now_playing_artwork (DmapControlPlayer* base,
+ guint width,
+ guint height);
static void vala_dacp_player_real_play_pause (DmapControlPlayer* base);
static void vala_dacp_player_real_pause (DmapControlPlayer* base);
static void vala_dacp_player_real_next_item (DmapControlPlayer* base);
static void vala_dacp_player_real_prev_item (DmapControlPlayer* base);
static void vala_dacp_player_real_cue_clear (DmapControlPlayer* base);
-static void vala_dacp_player_real_cue_play (DmapControlPlayer* base, GList* records, guint index);
+static void vala_dacp_player_real_cue_play (DmapControlPlayer* base,
+ GList* records,
+ guint index);
ValaDacpPlayer* vala_dacp_player_new (void);
ValaDacpPlayer* vala_dacp_player_construct (GType object_type);
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))
DacpListener* dacp_listener_new (void);
DacpListener* dacp_listener_construct (GType object_type);
ValaDmapDb* vala_dmap_db_new (void);
@@ -136,15 +138,25 @@ GType vala_dmap_db_get_type (void) G_GNUC_CONST;
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__dmap_control_share_remote_found (DmapControlShare* _sender, const gchar*
service_name, const gchar* remote_name, gpointer self);
-static void __lambda5_ (DacpListener* self, const gchar* guid);
-static void ___lambda5__dmap_control_share_add_guid (DmapControlShare* _sender, const gchar* guid, gpointer
self);
+static void __lambda4_ (DacpListener* self,
+ const gchar* service_name,
+ const gchar* display_name);
+static void ___lambda4__dmap_control_share_remote_found (DmapControlShare* _sender,
+ const gchar* service_name,
+ const gchar* remote_name,
+ gpointer self);
+static void __lambda5_ (DacpListener* self,
+ const gchar* guid);
+static void ___lambda5__dmap_control_share_add_guid (DmapControlShare* _sender,
+ const gchar* guid,
+ gpointer self);
static void dacp_listener_finalize (GObject * obj);
-gint _vala_main (gchar** args, int args_length1);
-
+gint _vala_main (gchar** args,
+ gint args_length1);
-static DmapAvRecord* vala_dacp_player_real_now_playing_record (DmapControlPlayer* base) {
+static DmapAvRecord*
+vala_dacp_player_real_now_playing_record (DmapControlPlayer* base)
+{
ValaDacpPlayer * self;
DmapAvRecord* result = NULL;
FILE* _tmp0_;
@@ -155,8 +167,11 @@ static DmapAvRecord* vala_dacp_player_real_now_playing_record (DmapControlPlayer
return result;
}
-
-static const gchar* vala_dacp_player_real_now_playing_artwork (DmapControlPlayer* base, guint width, guint
height) {
+static const gchar*
+vala_dacp_player_real_now_playing_artwork (DmapControlPlayer* base,
+ guint width,
+ guint height)
+{
ValaDacpPlayer * self;
const gchar* result = NULL;
FILE* _tmp0_;
@@ -167,8 +182,9 @@ static const gchar* vala_dacp_player_real_now_playing_artwork (DmapControlPlayer
return result;
}
-
-static void vala_dacp_player_real_play_pause (DmapControlPlayer* base) {
+static void
+vala_dacp_player_real_play_pause (DmapControlPlayer* base)
+{
ValaDacpPlayer * self;
FILE* _tmp0_;
self = (ValaDacpPlayer*) base;
@@ -176,8 +192,9 @@ static void vala_dacp_player_real_play_pause (DmapControlPlayer* base) {
fprintf (_tmp0_, "Play/pause request received\n");
}
-
-static void vala_dacp_player_real_pause (DmapControlPlayer* base) {
+static void
+vala_dacp_player_real_pause (DmapControlPlayer* base)
+{
ValaDacpPlayer * self;
FILE* _tmp0_;
self = (ValaDacpPlayer*) base;
@@ -185,8 +202,9 @@ static void vala_dacp_player_real_pause (DmapControlPlayer* base) {
fprintf (_tmp0_, "Pause request received\n");
}
-
-static void vala_dacp_player_real_next_item (DmapControlPlayer* base) {
+static void
+vala_dacp_player_real_next_item (DmapControlPlayer* base)
+{
ValaDacpPlayer * self;
FILE* _tmp0_;
self = (ValaDacpPlayer*) base;
@@ -194,8 +212,9 @@ static void vala_dacp_player_real_next_item (DmapControlPlayer* base) {
fprintf (_tmp0_, "Next item request received\n");
}
-
-static void vala_dacp_player_real_prev_item (DmapControlPlayer* base) {
+static void
+vala_dacp_player_real_prev_item (DmapControlPlayer* base)
+{
ValaDacpPlayer * self;
FILE* _tmp0_;
self = (ValaDacpPlayer*) base;
@@ -203,8 +222,9 @@ static void vala_dacp_player_real_prev_item (DmapControlPlayer* base) {
fprintf (_tmp0_, "Previous item request received\n");
}
-
-static void vala_dacp_player_real_cue_clear (DmapControlPlayer* base) {
+static void
+vala_dacp_player_real_cue_clear (DmapControlPlayer* base)
+{
ValaDacpPlayer * self;
FILE* _tmp0_;
self = (ValaDacpPlayer*) base;
@@ -212,8 +232,11 @@ static void vala_dacp_player_real_cue_clear (DmapControlPlayer* base) {
fprintf (_tmp0_, "Cue clear request received\n");
}
-
-static void vala_dacp_player_real_cue_play (DmapControlPlayer* base, GList* records, guint index) {
+static void
+vala_dacp_player_real_cue_play (DmapControlPlayer* base,
+ GList* records,
+ guint index)
+{
ValaDacpPlayer * self;
FILE* _tmp0_;
self = (ValaDacpPlayer*) base;
@@ -221,42 +244,51 @@ static void vala_dacp_player_real_cue_play (DmapControlPlayer* base, GList* reco
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_dmap_control_player_interface_init (DmapControlPlayerInterface * iface) {
+static void
+vala_dacp_player_dmap_control_player_interface_init (DmapControlPlayerInterface * iface,
+ gpointer iface_data)
+{
vala_dacp_player_dmap_control_player_parent_iface = g_type_interface_peek_parent (iface);
- iface->now_playing_record = (DmapAvRecord* (*) (DmapControlPlayer *))
vala_dacp_player_real_now_playing_record;
- iface->now_playing_artwork = (const gchar* (*) (DmapControlPlayer *, guint, guint))
vala_dacp_player_real_now_playing_artwork;
- iface->play_pause = (void (*) (DmapControlPlayer *)) vala_dacp_player_real_play_pause;
- iface->pause = (void (*) (DmapControlPlayer *)) vala_dacp_player_real_pause;
- iface->next_item = (void (*) (DmapControlPlayer *)) vala_dacp_player_real_next_item;
- iface->prev_item = (void (*) (DmapControlPlayer *)) vala_dacp_player_real_prev_item;
- iface->cue_clear = (void (*) (DmapControlPlayer *)) vala_dacp_player_real_cue_clear;
- iface->cue_play = (void (*) (DmapControlPlayer *, GList*, guint)) vala_dacp_player_real_cue_play;
+ iface->now_playing_record = (DmapAvRecord* (*) (DmapControlPlayer*))
vala_dacp_player_real_now_playing_record;
+ iface->now_playing_artwork = (const gchar* (*) (DmapControlPlayer*, guint, guint))
vala_dacp_player_real_now_playing_artwork;
+ iface->play_pause = (void (*) (DmapControlPlayer*)) vala_dacp_player_real_play_pause;
+ iface->pause = (void (*) (DmapControlPlayer*)) vala_dacp_player_real_pause;
+ iface->next_item = (void (*) (DmapControlPlayer*)) vala_dacp_player_real_next_item;
+ iface->prev_item = (void (*) (DmapControlPlayer*)) vala_dacp_player_real_prev_item;
+ iface->cue_clear = (void (*) (DmapControlPlayer*)) vala_dacp_player_real_cue_clear;
+ iface->cue_play = (void (*) (DmapControlPlayer*, 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)
+{
}
-
-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 };
@@ -269,39 +301,54 @@ GType vala_dacp_player_get_type (void) {
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) {
+static void
+__lambda4_ (DacpListener* self,
+ const gchar* service_name,
+ const gchar* display_name)
+{
FILE* _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
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__dmap_control_share_remote_found (DmapControlShare* _sender, const gchar*
service_name, const gchar* remote_name, gpointer self) {
+static void
+___lambda4__dmap_control_share_remote_found (DmapControlShare* _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) {
+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__dmap_control_share_add_guid (DmapControlShare* _sender, const gchar* guid, gpointer
self) {
+static void
+___lambda5__dmap_control_share_add_guid (DmapControlShare* _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_;
ValaDmapContainerDb* _tmp1_;
@@ -313,6 +360,7 @@ DacpListener* dacp_listener_construct (GType object_type) {
DmapControlShare* _tmp7_;
DmapControlShare* _tmp8_;
DmapControlShare* _tmp9_;
+ GError* _inner_error0_ = NULL;
self = (DacpListener*) g_object_new (object_type, NULL);
_tmp0_ = vala_dmap_db_new ();
_g_object_unref0 (self->priv->db);
@@ -334,29 +382,40 @@ DacpListener* dacp_listener_construct (GType object_type) {
_tmp8_ = self->priv->share;
g_signal_connect_object (_tmp8_, "add-guid", (GCallback) ___lambda5__dmap_control_share_add_guid,
self, 0);
_tmp9_ = self->priv->share;
- dmap_control_share_start_lookup (_tmp9_);
+ dmap_control_share_start_lookup (_tmp9_, &_inner_error0_);
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
+ 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;
+ }
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);
@@ -366,20 +425,24 @@ static void dacp_listener_finalize (GObject * obj) {
G_OBJECT_CLASS (dacp_listener_parent_class)->finalize (obj);
}
-
-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);
+ DacpListener_private_offset = g_type_add_instance_private (dacp_listener_type_id, sizeof
(DacpListenerPrivate));
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
+_vala_main (gchar** args,
+ gint args_length1)
+{
gint result = 0;
GMainLoop* loop = NULL;
GMainLoop* _tmp0_;
@@ -396,10 +459,10 @@ gint _vala_main (gchar** args, int args_length1) {
return result;
}
-
-int main (int argc, char ** argv) {
+int
+main (int argc,
+ char ** argv)
+{
return _vala_main (argv, argc);
}
-
-
diff --git a/tests/dmapcopy.c b/tests/dmapcopy.c
index 1b9ac47..8faca36 100644
--- a/tests/dmapcopy.c
+++ b/tests/dmapcopy.c
@@ -1,4 +1,4 @@
-/* dmapcopy.c generated by valac 0.38.8, the Vala compiler
+/* dmapcopy.c generated by valac 0.44.3, 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))
@@ -100,137 +99,183 @@ 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;
GType vala_dmap_db_get_type (void) G_GNUC_CONST;
GType vala_image_record_factory_get_type (void) G_GNUC_CONST;
-#define DPAP_COPY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DPAP_COPY, DPAPCopyPrivate))
-static gboolean dpap_copy_connected_cb (DPAPCopy* self, DmapConnection* connection, gboolean _result_, const
gchar* reason);
-static void __lambda4_ (DPAPCopy* self, guint k, DmapRecord* v);
+static gboolean dpap_copy_connected_cb (DPAPCopy* self,
+ DmapConnection* connection,
+ gboolean _result_,
+ const gchar* reason);
+static void __lambda4_ (DPAPCopy* self,
+ guint k,
+ DmapRecord* v);
GType vala_image_record_get_type (void) G_GNUC_CONST;
const gchar* vala_image_record_get_location (ValaImageRecord* self);
-static void ___lambda4__dmap_id_record_func (guint id, DmapRecord* record, gpointer self);
+static void ___lambda4__dmap_id_record_func (guint id,
+ DmapRecord* record,
+ 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);
ValaImageRecordFactory* vala_image_record_factory_new (void);
ValaImageRecordFactory* vala_image_record_factory_construct (GType object_type);
-static void __lambda5_ (DPAPCopy* self, DmapMdnsBrowser* browser, DmapMdnsService* service);
-static gboolean _dpap_copy_connected_cb_dmap_connection_func (DmapConnection* connection, gboolean _result_,
const gchar* reason, gpointer self);
-static void ___lambda5__dmap_mdns_browser_service_added (DmapMdnsBrowser* _sender, DmapMdnsService* service,
gpointer self);
+static void __lambda5_ (DPAPCopy* self,
+ DmapMdnsBrowser* browser,
+ DmapMdnsService* service);
+static gboolean _dpap_copy_connected_cb_dmap_connection_func (DmapConnection* connection,
+ gboolean _result_,
+ const gchar* reason,
+ gpointer self);
+static void ___lambda5__dmap_mdns_browser_service_added (DmapMdnsBrowser* _sender,
+ DmapMdnsService* 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);
-
+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, guint k, DmapRecord* v) {
+static void
+__lambda4_ (DPAPCopy* self,
+ guint k,
+ DmapRecord* v)
+{
FILE* _tmp0_;
- DmapRecord* _tmp1_;
+ const gchar* _tmp1_;
const gchar* _tmp2_;
- const gchar* _tmp3_;
g_return_if_fail (v != NULL);
_tmp0_ = stdout;
- _tmp1_ = v;
- _tmp2_ = vala_image_record_get_location (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VALA_IMAGE_RECORD,
ValaImageRecord));
- _tmp3_ = _tmp2_;
- fprintf (_tmp0_, "%s\n", _tmp3_);
+ _tmp1_ = vala_image_record_get_location (G_TYPE_CHECK_INSTANCE_CAST (v, TYPE_VALA_IMAGE_RECORD,
ValaImageRecord));
+ _tmp2_ = _tmp1_;
+ fprintf (_tmp0_, "%s\n", _tmp2_);
}
-
-static void ___lambda4__dmap_id_record_func (guint id, DmapRecord* record, gpointer self) {
+static void
+___lambda4__dmap_id_record_func (guint id,
+ DmapRecord* record,
+ gpointer self)
+{
__lambda4_ ((DPAPCopy*) self, id, record);
}
-
-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)
+{
gboolean result = FALSE;
ValaDmapDb* _tmp0_;
- gint64 _tmp1_;
- ValaDmapDb* _tmp2_;
+ ValaDmapDb* _tmp1_;
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 ("%" G_GINT64_FORMAT " entries\n", _tmp1_);
- _tmp2_ = self->priv->db;
- dmap_db_foreach ((DmapDb*) _tmp2_, ___lambda4__dmap_id_record_func, self);
+ g_debug ("%" G_GINT64_FORMAT " entries\n", dmap_db_count ((DmapDb*) _tmp0_));
+ _tmp1_ = self->priv->db;
+ dmap_db_foreach ((DmapDb*) _tmp1_, ___lambda4__dmap_id_record_func, self);
result = TRUE;
return result;
}
-
-static gboolean _dpap_copy_connected_cb_dmap_connection_func (DmapConnection* connection, gboolean _result_,
const gchar* reason, gpointer self) {
+static gboolean
+_dpap_copy_connected_cb_dmap_connection_func (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 __lambda5_ (DPAPCopy* self, DmapMdnsBrowser* browser, DmapMdnsService* service) {
- DmapMdnsService* _tmp0_;
+static void
+__lambda5_ (DPAPCopy* self,
+ DmapMdnsBrowser* browser,
+ DmapMdnsService* service)
+{
+ gchar* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
- DmapMdnsService* _tmp4_;
+ gchar* _tmp4_;
gchar* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- DmapMdnsService* _tmp8_;
- guint _tmp9_;
- guint _tmp10_;
- ValaDmapDb* _tmp11_;
- ValaImageRecordFactory* _tmp12_;
- DmapImageConnection* _tmp13_;
- DmapConnection* _tmp14_;
+ guint _tmp6_;
+ guint _tmp7_;
+ ValaDmapDb* _tmp8_;
+ ValaImageRecordFactory* _tmp9_;
+ DmapImageConnection* _tmp10_;
+ DmapConnection* _tmp11_;
g_return_if_fail (browser != NULL);
g_return_if_fail (service != NULL);
- _tmp0_ = service;
- g_object_get (_tmp0_, "service-name", &_tmp1_, NULL);
+ g_object_get (service, "service-name", &_tmp0_, NULL);
+ _tmp1_ = _tmp0_;
_tmp2_ = _tmp1_;
- _tmp3_ = _tmp2_;
- _tmp4_ = service;
- g_object_get (_tmp4_, "host", &_tmp5_, NULL);
- _tmp6_ = _tmp5_;
+ g_object_get (service, "host", &_tmp3_, NULL);
+ _tmp4_ = _tmp3_;
+ _tmp5_ = _tmp4_;
+ g_object_get (service, "port", &_tmp6_, NULL);
_tmp7_ = _tmp6_;
- _tmp8_ = service;
- g_object_get (_tmp8_, "port", &_tmp9_, NULL);
- _tmp10_ = _tmp9_;
- _tmp11_ = self->priv->db;
- _tmp12_ = self->priv->factory;
- _tmp13_ = dmap_image_connection_new (_tmp3_, _tmp7_, _tmp10_, (DmapDb*) _tmp11_, (DmapRecordFactory*)
_tmp12_);
+ _tmp8_ = self->priv->db;
+ _tmp9_ = self->priv->factory;
+ _tmp10_ = dmap_image_connection_new (_tmp2_, _tmp5_, _tmp7_, (DmapDb*) _tmp8_, (DmapRecordFactory*)
_tmp9_);
_g_object_unref0 (self->priv->connection);
- self->priv->connection = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, DMAP_TYPE_CONNECTION, DmapConnection);
- _g_free0 (_tmp7_);
- _g_free0 (_tmp3_);
- _tmp14_ = self->priv->connection;
- dmap_connection_start (_tmp14_, _dpap_copy_connected_cb_dmap_connection_func, self);
+ self->priv->connection = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, DMAP_TYPE_CONNECTION, DmapConnection);
+ _g_free0 (_tmp5_);
+ _g_free0 (_tmp2_);
+ _tmp11_ = self->priv->connection;
+ dmap_connection_start (_tmp11_, _dpap_copy_connected_cb_dmap_connection_func, self);
}
-
-static void ___lambda5__dmap_mdns_browser_service_added (DmapMdnsBrowser* _sender, DmapMdnsService* service,
gpointer self) {
+static void
+___lambda5__dmap_mdns_browser_service_added (DmapMdnsBrowser* _sender,
+ DmapMdnsService* service,
+ gpointer self)
+{
__lambda5_ ((DPAPCopy*) self, _sender, service);
}
-
-DPAPCopy* dpap_copy_construct (GType object_type, GError** error) {
+DPAPCopy*
+dpap_copy_construct (GType object_type,
+ GError** error)
+{
DPAPCopy* self = NULL;
ValaDmapDb* _tmp0_;
ValaImageRecordFactory* _tmp1_;
DmapMdnsBrowser* _tmp2_;
DmapMdnsBrowser* _tmp3_;
DmapMdnsBrowser* _tmp4_;
- GError * _inner_error_ = NULL;
+ GError* _inner_error0_ = NULL;
self = (DPAPCopy*) g_type_create_instance (object_type);
_tmp0_ = vala_dmap_db_new ();
_g_object_unref0 (self->priv->db);
@@ -244,34 +289,39 @@ DPAPCopy* dpap_copy_construct (GType object_type, GError** error) {
_tmp3_ = self->priv->browser;
g_signal_connect (_tmp3_, "service-added", (GCallback) ___lambda5__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 {
@@ -279,13 +329,18 @@ 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;
object = collect_values[0].v_pointer;
@@ -301,8 +356,12 @@ 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) {
+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) {
@@ -318,8 +377,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);
@@ -327,14 +391,17 @@ 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) {
+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;
@@ -351,8 +418,10 @@ void value_set_dpap_copy (GValue* value, gpointer v_object) {
}
}
-
-void value_take_dpap_copy (GValue* value, gpointer v_object) {
+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;
@@ -368,21 +437,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);
@@ -392,8 +466,9 @@ static void dpap_copy_finalize (DPAPCopy * obj) {
_g_object_unref0 (self->priv->factory);
}
-
-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 };
@@ -401,21 +476,24 @@ GType dpap_copy_get_type (void) {
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));
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) {
+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) {
+void
+dpap_copy_unref (gpointer instance)
+{
DPAPCopy * self;
self = instance;
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -424,43 +502,53 @@ void dpap_copy_unref (gpointer instance) {
}
}
-
-void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
+void
+debug_printf (const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message)
+{
FILE* _tmp0_;
- const gchar* _tmp1_;
_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
+_vala_main (gchar** args,
+ gint args_length1)
+{
gint result = 0;
GMainLoop* loop = NULL;
GMainLoop* _tmp0_;
DPAPCopy* dmapcopy = NULL;
DPAPCopy* _tmp1_;
- GError * _inner_error_ = NULL;
+ GError* _inner_error0_ = NULL;
_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)) {
- gint _tmp2_ = 0;
+ 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_);
+ 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);
@@ -470,10 +558,10 @@ gint _vala_main (gchar** args, int args_length1) {
return result;
}
-
-int main (int argc, char ** argv) {
+int
+main (int argc,
+ char ** argv)
+{
return _vala_main (argv, argc);
}
-
-
diff --git a/tests/dmapserve.c b/tests/dmapserve.c
index 0de6d1d..6fbda32 100644
--- a/tests/dmapserve.c
+++ b/tests/dmapserve.c
@@ -1,4 +1,4 @@
-/* dmapserve.c generated by valac 0.38.8, the Vala compiler
+/* dmapserve.c generated by valac 0.44.3, 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))
@@ -100,22 +99,28 @@ 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;
GType vala_image_record_get_type (void) G_GNUC_CONST;
GType vala_dmap_db_get_type (void) G_GNUC_CONST;
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))
DPAPServe* dpap_serve_new (GError** error);
-DPAPServe* dpap_serve_construct (GType object_type, GError** error);
+DPAPServe* dpap_serve_construct (GType object_type,
+ GError** error);
ValaImageRecord* vala_image_record_new (void);
ValaImageRecord* vala_image_record_construct (GType object_type);
ValaDmapDb* vala_dmap_db_new (void);
@@ -123,13 +128,29 @@ 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);
-
+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;
ValaImageRecord* _tmp0_;
ValaDmapDb* _tmp1_;
@@ -139,7 +160,7 @@ DPAPServe* dpap_serve_construct (GType object_type, GError** error) {
ValaDmapDb* _tmp5_;
ValaDmapContainerDb* _tmp6_;
DmapImageShare* _tmp7_;
- GError * _inner_error_ = NULL;
+ GError* _inner_error0_ = NULL;
self = (DPAPServe*) g_type_create_instance (object_type);
_tmp0_ = vala_image_record_new ();
_g_object_unref0 (self->priv->record);
@@ -149,9 +170,9 @@ DPAPServe* dpap_serve_construct (GType object_type, GError** error) {
self->priv->db = _tmp1_;
_tmp2_ = self->priv->db;
_tmp3_ = self->priv->record;
- dmap_db_add ((DmapDb*) _tmp2_, (DmapRecord*) _tmp3_, &_inner_error_);
- if (G_UNLIKELY (_inner_error_ != NULL)) {
- g_propagate_error (error, _inner_error_);
+ dmap_db_add ((DmapDb*) _tmp2_, (DmapRecord*) _tmp3_, &_inner_error0_);
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
+ g_propagate_error (error, _inner_error0_);
_dpap_serve_unref0 (self);
return NULL;
}
@@ -167,13 +188,13 @@ DPAPServe* dpap_serve_construct (GType object_type, GError** error) {
DmapImageShare* _tmp8_;
DmapImageShare* _tmp9_;
_tmp8_ = self->priv->share;
- dmap_share_serve ((DmapShare*) _tmp8_, &_inner_error_);
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ dmap_share_serve ((DmapShare*) _tmp8_, &_inner_error0_);
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
goto __catch0_g_error;
}
_tmp9_ = self->priv->share;
- dmap_share_publish ((DmapShare*) _tmp9_, &_inner_error_);
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ dmap_share_publish ((DmapShare*) _tmp9_, &_inner_error0_);
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
goto __catch0_g_error;
}
}
@@ -182,40 +203,45 @@ DPAPServe* dpap_serve_construct (GType object_type, GError** error) {
{
GError* e = NULL;
const gchar* _tmp10_;
- e = _inner_error_;
- _inner_error_ = NULL;
+ e = _inner_error0_;
+ _inner_error0_ = NULL;
_tmp10_ = e->message;
g_error ("dmapserve.vala:39: Error starting server: %s", _tmp10_);
_g_error_free0 (e);
}
__finally0:
- if (G_UNLIKELY (_inner_error_ != NULL)) {
- g_propagate_error (error, _inner_error_);
+ if (G_UNLIKELY (_inner_error0_ != NULL)) {
+ g_propagate_error (error, _inner_error0_);
_dpap_serve_unref0 (self);
return NULL;
}
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 {
@@ -223,13 +249,18 @@ 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;
object = collect_values[0].v_pointer;
@@ -245,8 +276,12 @@ 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) {
+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) {
@@ -262,8 +297,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);
@@ -271,14 +311,17 @@ 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) {
+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;
@@ -295,8 +338,10 @@ void value_set_dpap_serve (GValue* value, gpointer v_object) {
}
}
-
-void value_take_dpap_serve (GValue* value, gpointer v_object) {
+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;
@@ -312,21 +357,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);
@@ -336,8 +386,9 @@ static void dpap_serve_finalize (DPAPServe * obj) {
_g_object_unref0 (self->priv->share);
}
-
-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 };
@@ -345,21 +396,24 @@ GType dpap_serve_get_type (void) {
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));
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) {
+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) {
+void
+dpap_serve_unref (gpointer instance)
+{
DPAPServe * self;
self = instance;
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -368,43 +422,53 @@ void dpap_serve_unref (gpointer instance) {
}
}
-
-void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
+void
+debug_printf (const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message)
+{
FILE* _tmp0_;
- const gchar* _tmp1_;
_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
+_vala_main (gchar** args,
+ gint args_length1)
+{
gint result = 0;
GMainLoop* loop = NULL;
GMainLoop* _tmp0_;
DPAPServe* dmapcopy = NULL;
DPAPServe* _tmp1_;
- GError * _inner_error_ = NULL;
+ GError* _inner_error0_ = NULL;
_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)) {
- gint _tmp2_ = 0;
+ 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_);
+ 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);
@@ -414,10 +478,10 @@ gint _vala_main (gchar** args, int args_length1) {
return result;
}
-
-int main (int argc, char ** argv) {
+int
+main (int argc,
+ char ** argv)
+{
return _vala_main (argv, argc);
}
-
-
diff --git a/tests/vala-dmap-container-db.c b/tests/vala-dmap-container-db.c
index 228d9eb..cf43a4a 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.38.8, the Vala compiler
+/* vala-dmap-container-db.c generated by valac 0.44.3, 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))
@@ -59,22 +58,33 @@ struct _ValaDmapContainerDbPrivate {
GeeArrayList* db;
};
-
+static gint ValaDmapContainerDb_private_offset;
static gpointer vala_dmap_container_db_parent_class = NULL;
static DmapContainerDbInterface * 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))
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, GError**
error);
+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,
+ GError** error);
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 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;
gint64 result = 0LL;
GeeArrayList* _tmp0_;
@@ -88,8 +98,11 @@ static gint64 vala_dmap_container_db_real_count (DmapContainerDb* base) {
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;
@@ -98,105 +111,113 @@ static void vala_dmap_container_db_real_foreach (DmapContainerDb* base, GHFunc f
i = 0;
_tmp0_ = TRUE;
while (TRUE) {
- gint _tmp2_;
- GeeArrayList* _tmp3_;
+ GeeArrayList* _tmp2_;
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
- GHFunc _tmp6_;
- void* _tmp6__target;
- gint _tmp7_;
- void* _tmp8_;
- GeeArrayList* _tmp9_;
- gint _tmp10_;
- gpointer _tmp11_;
+ void* _tmp5_;
+ GeeArrayList* _tmp6_;
+ gpointer _tmp7_;
+ DmapRecord* _tmp8_;
if (!_tmp0_) {
gint _tmp1_;
_tmp1_ = i;
i = _tmp1_ + 1;
}
_tmp0_ = FALSE;
- _tmp2_ = i;
- _tmp3_ = self->priv->db;
- _tmp4_ = gee_abstract_collection_get_size ((GeeAbstractCollection*) _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);
+ _tmp8_ = (DmapRecord*) _tmp7_;
+ func (_tmp5_, _tmp8_, func_target);
+ _g_object_unref0 (_tmp8_);
}
}
}
-
-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");
+ g_error ("vala-dmap-container-db.vala:40: lookup_by_id not implemented");
return result;
}
-
-static void vala_dmap_container_db_real_add (DmapContainerDb* base, DmapContainerRecord* record, GError**
error) {
+static void
+vala_dmap_container_db_real_add (DmapContainerDb* base,
+ DmapContainerRecord* record,
+ GError** error)
+{
ValaDmapContainerDb * self;
self = (ValaDmapContainerDb*) base;
g_return_if_fail (record != NULL);
- g_error ("vala-dmap-container-db.vala:45: add not implemented");
+ g_error ("vala-dmap-container-db.vala:44: 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 (DmapContainerDbInterface * iface) {
+static void
+vala_dmap_container_db_dmap_container_db_interface_init (DmapContainerDbInterface * 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 *, DmapIdContainerRecordFunc, 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*, GError**))
vala_dmap_container_db_real_add;
+ iface->count = (gint64 (*) (DmapContainerDb*)) vala_dmap_container_db_real_count;
+ iface->foreach = (void (*) (DmapContainerDb*, DmapIdContainerRecordFunc, 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*, GError**))
vala_dmap_container_db_real_add;
}
-
-static void vala_dmap_container_db_instance_init (ValaDmapContainerDb * self) {
+static void
+vala_dmap_container_db_instance_init (ValaDmapContainerDb * self,
+ gpointer klass)
+{
GeeArrayList* _tmp0_;
- self->priv = VALA_DMAP_CONTAINER_DB_GET_PRIVATE (self);
+ self->priv = vala_dmap_container_db_get_instance_private (self);
_tmp0_ = gee_array_list_new (DMAP_TYPE_RECORD, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify)
g_object_unref, 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);
}
-
-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 };
@@ -204,10 +225,9 @@ GType vala_dmap_container_db_get_type (void) {
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));
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;
}
-
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
