X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/4d52efa59ae13beb3030e6e9ebdddb4ef8c0a5c8..947f12306d4236c63a7f3449191ec8337ee42469:/src/engine/music.c diff --git a/src/engine/music.c b/src/engine/music.c index 4295a66..55253fe 100644 --- 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 #include #include +#include #include "music-module.h" -#include "music.h" #include "upkg.h" #define MUSIC_GET_PRIV(o) \ @@ -38,7 +38,7 @@ struct music_priv { static void exportable_init(UObjectExportable *); static void loadable_init(UObjectLoadable *); -G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_OBJECT_TYPE, 0, +G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_TYPE_OBJECT, 0, G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_EXPORTABLE, exportable_init) G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_LOADABLE, loadable_init) );