uobject: Rename some interface-related identifiers.

[upkg.git] / src / engine / music.c

diff --git a/src/engine/music.c b/src/engine/music.c
index 8c17f9ddfa19e8a1d9d6da6b0e3ae4391395a433..345fc3536499575eed27f1e31bf5c5f38668ddf6 100644 (file)
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -1,6 +1,6 @@
 /*
  *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright (C) 2009 Nick Bowler
+ *  Copyright © 2009-2011 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@
 #include <uobject/uobject.h>
 #include <uobject/exportable.h>
 #include <uobject/loadable.h>
+#include <engine/music.h>
 #include "music-module.h"
-#include "music.h"
 #include "upkg.h"
 
 #define MUSIC_GET_PRIV(o) \
@@ -35,12 +35,12 @@ struct music_priv {
        unsigned loaded;
 };
 
-static void exportable_init(UObjectExportable *);
-static void loadable_init(UObjectLoadable *);
+static void exportable_init(UObjectExportableIface *);
+static void loadable_init(UObjectLoadableIface *);
 
-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, U_TYPE_OBJECT, 0,
+       G_IMPLEMENT_INTERFACE(U_TYPE_OBJECT_EXPORTABLE, exportable_init)
+       G_IMPLEMENT_INTERFACE(U_TYPE_OBJECT_LOADABLE, loadable_init)
 );
 
 static int load(GObject *o)
@@ -109,13 +109,13 @@ static int export_name(GObject *o, char *buf, size_t n)
        return rc;
 }
 
-static void exportable_init(UObjectExportable *e)
+static void exportable_init(UObjectExportableIface *e)
 {
        e->export      = export;
        e->export_name = export_name;
 }
 
-static void loadable_init(UObjectLoadable *l)
+static void loadable_init(UObjectLoadableIface *l)
 {
        l->load   = load;
        l->unload = unload;
@@ -138,7 +138,7 @@ static int deserialize(UObject *uo)
                return -1;
        pos += 1;
 
-       if (f->pkg->version > 61) {
+       if (uo->pkg->version > 61) {
                /* Random field #2 */
                if (buflen - pos < 4)
                        return -1;