X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/71adb9bfdbddaa51139bcc4ee9822aff816e8fce..c6537566467e27e40028254b4c7da145417682cf:/src/engine/music.c

diff --git a/src/engine/music.c b/src/engine/music.c
index 565a6a0..434d881 100644
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -40,9 +40,9 @@ struct music_priv {
 static void exportable_init(UObjectExportable *);
 static void loadable_init(UObjectLoadable *);
 
-G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_OBJECT_TYPE, 0,
-	G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_EXPORTABLE, exportable_init)
-	G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_LOADABLE, loadable_init)
+G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, UOBJECT_TYPE, 0,
+	G_IMPLEMENT_INTERFACE(UOBJECT_TYPE_EXPORTABLE, exportable_init)
+	G_IMPLEMENT_INTERFACE(UOBJECT_TYPE_LOADABLE, loadable_init)
 );
 
 static int load(GObject *o)
@@ -129,7 +129,7 @@ static int deserialize(UObject *o, struct upkg_file *f)
 	unsigned char buf[32];
 	long size;
 
-	U_OBJECT_CLASS(engine_music_parent_class)->deserialize(o, f);
+	UOBJECT_CLASS(engine_music_parent_class)->deserialize(o, f);
 
 	buflen = upkg_export_read(f, buf, sizeof buf);
 
@@ -183,7 +183,7 @@ static void engine_music_finalize(GObject *o)
 
 static void engine_music_class_init(EngineMusicClass *class)
 {
-	UObjectClass *uo = U_OBJECT_CLASS(class);
+	UObjectClass *uo = UOBJECT_CLASS(class);
 	GObjectClass *go = G_OBJECT_CLASS(class);
 	g_type_class_add_private(class, sizeof (struct music_priv));