* 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,
* 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 <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
#include <string.h>
#include <glib-object.h>
-#include "exportable.h"
-#include "loadable.h"
-#include "uobject.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
+#include <uobject/loadable.h>
#include "music-module.h"
#include "music.h"
#include "upkg.h"
l->unload = unload;
}
-static int deserialize(UObject *o, struct upkg_file *f)
+static int deserialize(UObject *uo)
{
- struct music_priv *priv = MUSIC_GET_PRIV(o);
+ struct music_priv *priv = MUSIC_GET_PRIV(uo);
+ struct upkg_file *f = uo->pkg_file;
size_t rc, pos = 0, buflen;
unsigned char buf[32];
long size;
- U_OBJECT_CLASS(engine_music_parent_class)->deserialize(o, f);
+ U_OBJECT_CLASS(engine_music_parent_class)->deserialize(uo);
buflen = upkg_export_read(f, buf, sizeof buf);
priv->loaded = 1;
unload(o);
}
+
+ G_OBJECT_CLASS(engine_music_parent_class)->finalize(o);
}
static void engine_music_class_init(EngineMusicClass *class)