X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/c6537566467e27e40028254b4c7da145417682cf..aad8ee14a07f8dca2bbc6f116067c14ecd62f655:/src/engine/music.c?ds=sidebyside
diff --git a/src/engine/music.c b/src/engine/music.c
index 434d881..ae2db1e 100644
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -2,9 +2,9 @@
* upkg: tool for manipulating Unreal Tournament packages.
* Copyright (C) 2009 Nick Bowler
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see .
*/
#include
@@ -40,9 +39,9 @@ struct music_priv {
static void exportable_init(UObjectExportable *);
static void loadable_init(UObjectLoadable *);
-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)
+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)
);
static int load(GObject *o)
@@ -129,7 +128,7 @@ static int deserialize(UObject *o, struct upkg_file *f)
unsigned char buf[32];
long size;
- UOBJECT_CLASS(engine_music_parent_class)->deserialize(o, f);
+ U_OBJECT_CLASS(engine_music_parent_class)->deserialize(o, f);
buflen = upkg_export_read(f, buf, sizeof buf);
@@ -183,7 +182,7 @@ static void engine_music_finalize(GObject *o)
static void engine_music_class_init(EngineMusicClass *class)
{
- UObjectClass *uo = UOBJECT_CLASS(class);
+ UObjectClass *uo = U_OBJECT_CLASS(class);
GObjectClass *go = G_OBJECT_CLASS(class);
g_type_class_add_private(class, sizeof (struct music_priv));