X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/90b53df329f9a114770dccab6b7e41f9094dfac9..6637b91cdb7b3d3e923f3d72e36be07e9009e7e8:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index f2ad3bc..8c26d27 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -23,7 +23,7 @@
 
 #include "upkg.h"
 #include "module.h"
-#include "serializable.h"
+#include "uobject.h"
 #include "exportable.h"
 
 void print_upkg_flags(const char *prefix, unsigned long flags)
@@ -87,20 +87,17 @@ int main(int argc, char **argv)
 	printf("Exports: %lu\n", pkg->export_count);
 	printf("Imports: %lu\n", pkg->import_count);
 
-	UPkgModule *m = upkg_module_new("engine");
-	g_type_module_use(G_TYPE_MODULE(m));
-
-	GObject *music = g_object_new(g_type_from_name("EngineMusic"), NULL);
+	GObject *music = g_object_new(module_get_class("Engine", "Music"), NULL);
 	if (!music)
 		return EXIT_FAILURE;
 	struct upkg_file *f = upkg_export_open(pkg, 0);
-	upkg_deserialize(music, f);
+	u_object_deserialize(music, f);
 
 	char name[256];
-	upkg_export_name(music, name, sizeof name);
+	u_object_export_name(music, name, sizeof name);
 	FILE *fp = fopen(name, "wb");
 	if (!fp) return EXIT_FAILURE;
-	upkg_export(music, fp);
+	u_object_export(music, fp);
 	fclose(fp);
 	printf("Wrote %s\n", name);