uobject: More namespace cleanups.

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

diff --git a/src/engine/music.c b/src/engine/music.c
index f770662995e8f63e2ea359117b005850783b7fc6..434d881fda70d1fe51f1efd2bd3989f05a4eadb6 100644 (file)
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -1,10 +1,30 @@
+/*
+ *  upkg: tool for manipulating Unreal Tournament packages.
+ *  Copyright (C) 2009 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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  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
+ */
+
 #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"
 
@@ -13,15 +33,16 @@
 
 struct music_priv {
        struct upkg_file *f;
+       struct music_mod *mod;
        unsigned loaded;
 };
 
 static void exportable_init(UObjectExportable *);
 static void loadable_init(UObjectLoadable *);
 
-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, UOBJECT_TYPE, 0,
+       G_IMPLEMENT_INTERFACE(UOBJECT_TYPE_EXPORTABLE, exportable_init)
+       G_IMPLEMENT_INTERFACE(UOBJECT_TYPE_LOADABLE, loadable_init)
 );
 
 static int load(GObject *o)
@@ -34,6 +55,11 @@ static int load(GObject *o)
                if (upkg_export_seek(priv->f, 0, SEEK_SET) != 0) {
                        return -1;
                }
+
+               priv->mod = music_mod_open(priv->f);
+               if (!priv->mod) {
+                       return -1;
+               }
        }
 
        priv->loaded++;
@@ -45,35 +71,43 @@ static void unload(GObject *o)
        struct music_priv *priv = MUSIC_GET_PRIV(o);
        g_return_if_fail(priv->loaded > 0);
 
-       --priv->loaded;
+       if (--priv->loaded == 0) {
+               music_mod_close(priv->mod);
+       }
 }
 
 static int export(GObject *o, FILE *f)
 {
        struct music_priv *priv = MUSIC_GET_PRIV(o);
-       unsigned char buf[1024];
+       int rc;
 
-       if (!priv->f || upkg_export_seek(priv->f, 0, SEEK_SET) != 0)
+       if (load(o) != 0)
                return -1;
 
-       while (!priv->f->eof) {
-               size_t rc = upkg_export_read(priv->f, buf, sizeof buf);
-               if (rc == 0) {
-                       if (priv->f->eof) break;
-                       return -1;
-               }
+       rc = music_mod_dump(priv->mod, f);
 
-               if (fwrite(buf, 1, rc, f) != rc)
-                       return -1;
-       }
+       unload(o);
 
-       return 0;
+       return rc;
 }
 
 static int export_name(GObject *o, char *buf, size_t n)
 {
        struct music_priv *priv = MUSIC_GET_PRIV(o);
-       return snprintf(buf, n, "%s", priv->f ? priv->f->name : "");
+       const char *type;
+       int rc;
+
+       if (load(o) != 0) {
+               if (n > 0) *buf = 0;
+               return 0;
+       }
+
+       type = music_mod_type(priv->mod);
+       rc = snprintf(buf, n, "%s.%s", priv->f->name, type);
+
+       unload(o);
+
+       return rc;
 }
 
 static void exportable_init(UObjectExportable *e)
@@ -91,12 +125,11 @@ static void loadable_init(UObjectLoadable *l)
 static int deserialize(UObject *o, struct upkg_file *f)
 {
        struct music_priv *priv = MUSIC_GET_PRIV(o);
-       EngineMusic *m = ENGINE_MUSIC(o);
        size_t rc, pos = 0, buflen;
        unsigned char buf[32];
        long size;
 
-       U_OBJECT_CLASS(engine_music_parent_class)->deserialize(o, f);
+       UOBJECT_CLASS(engine_music_parent_class)->deserialize(o, f);
 
        buflen = upkg_export_read(f, buf, sizeof buf);
 
@@ -120,7 +153,6 @@ static int deserialize(UObject *o, struct upkg_file *f)
        f->base += pos;
        f->len   = size;
        upkg_export_seek(f, 0, SEEK_SET);
-
        priv->f = f;
 
        return 0;
@@ -145,18 +177,23 @@ static void engine_music_finalize(GObject *o)
                priv->loaded = 1;
                unload(o);
        }
+
+       G_OBJECT_CLASS(engine_music_parent_class)->finalize(o);
 }
 
 static void engine_music_class_init(EngineMusicClass *class)
 {
-       UObjectClass *uo = U_OBJECT_CLASS(class);
+       UObjectClass *uo = UOBJECT_CLASS(class);
        GObjectClass *go = G_OBJECT_CLASS(class);
        g_type_class_add_private(class, sizeof (struct music_priv));
 
        uo->deserialize = deserialize;
        go->finalize    = engine_music_finalize;
+
+       music_mod_init();
 }
 
 static void engine_music_class_finalize(EngineMusicClass *class)
 {
+       music_mod_exit();
 }