X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/c5c6df2eb7c99ad0a82b20f584920d9018b1d3a2..1f5b72d49e29a126b35385a6277b411b1f97fbf5:/src/engine/music.gob

diff --git a/src/engine/music.gob b/src/engine/music.gob
index 920e23c..879e0ad 100644
--- a/src/engine/music.gob
+++ b/src/engine/music.gob
@@ -39,10 +39,10 @@ class Engine:Music from U:Object (dynamic)
 	private unsigned loaded = 0;
 
 	interface U:Object:Loadable
-	private int load(G:Object *go)
+	private int load(U:Object *uo)
 	{
-		struct upkg_file *f = U_OBJECT(go)->pkg_file;
-		Self *self = SELF(go);
+		struct upkg_file *f = uo->pkg_file;
+		Self *self = SELF(uo);
 
 		if (!self->_priv->loaded) {
 			g_return_val_if_fail(f != NULL, -1);
@@ -60,9 +60,9 @@ class Engine:Music from U:Object (dynamic)
 	}
 
 	interface U:Object:Loadable
-	private void unload(G:Object *go)
+	private void unload(U:Object *uo)
 	{
-		Self *self = SELF(go);
+		Self *self = SELF(uo);
 
 		g_return_if_fail(self->_priv->loaded > 0);
 
@@ -71,37 +71,37 @@ class Engine:Music from U:Object (dynamic)
 	}
 
 	interface U:Object:Exportable
-	private int export(G:Object *go, FILE *f)
+	private int export(U:Object *uo, FILE *f)
 	{
-		Self *self = SELF(go);
+		Self *self = SELF(uo);
 		int rc;
 
-		if (self_load(go) != 0)
+		if (self_load(uo) != 0)
 			return -1;
 
 		rc = music_mod_dump(self->_priv->mod, f);
 
-		self_unload(go);
+		self_unload(uo);
 		return rc;
 	}
 
 	interface U:Object:Exportable
-	private int export_name(G:Object *go, char *buf, size_t n)
+	private int export_name(U:Object *uo, char *buf, size_t n)
 	{
-		Self *self = SELF(go);
+		Self *self = SELF(uo);
 		const char *type;
 		int rc;
 
-		if (self_load(go) != 0) {
+		if (self_load(uo) != 0) {
 			if (n > 0)
 				buf[0] = '\0';
 			return 0;
 		}
 
 		type = music_mod_type(self->_priv->mod);
-		rc = snprintf(buf, n, "%s.%s", U_OBJECT(go)->pkg_file->name, type);
+		rc = snprintf(buf, n, "%s.%s", uo->pkg_file->name, type);
 
-		self_unload(go);
+		self_unload(uo);
 		return rc;
 	}