uobject: Remove the file parameter from deserialize.

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

diff --git a/src/engine/music.c b/src/engine/music.c
index ab00b17d777579e86110adab9903be8f15119300..f59e4a97c6f5fab87e43fddabf856f8deeabf490 100644 (file)
--- 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,17 +13,16 @@
  *  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"
@@ -122,14 +121,15 @@ static void loadable_init(UObjectLoadable *l)
        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);