From 3d673858df99c9ff1a10eb14ca57f8447923b094 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Fri, 11 Mar 2011 20:55:50 -0500 Subject: [PATCH] music: Remove file member from private struct. The UObject class already has a file member. Use that. --- src/engine/music.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/engine/music.c b/src/engine/music.c index f59e4a9..8c17f9d 100644 --- a/src/engine/music.c +++ b/src/engine/music.c @@ -31,7 +31,6 @@ G_TYPE_INSTANCE_GET_PRIVATE(o, ENGINE_MUSIC_TYPE, struct music_priv) struct music_priv { - struct upkg_file *f; struct music_mod *mod; unsigned loaded; }; @@ -47,15 +46,16 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_OBJECT_TYPE, 0, static int load(GObject *o) { struct music_priv *priv = MUSIC_GET_PRIV(o); + struct upkg_file *f = U_OBJECT(o)->pkg_file; if (!priv->loaded) { - g_return_val_if_fail(priv->f != NULL, -1); + g_return_val_if_fail(f != NULL, -1); - if (upkg_export_seek(priv->f, 0, SEEK_SET) != 0) { + if (upkg_export_seek(f, 0, SEEK_SET) != 0) { return -1; } - priv->mod = music_mod_open(priv->f); + priv->mod = music_mod_open(f); if (!priv->mod) { return -1; } @@ -102,7 +102,7 @@ static int export_name(GObject *o, char *buf, size_t n) } type = music_mod_type(priv->mod); - rc = snprintf(buf, n, "%s.%s", priv->f->name, type); + rc = snprintf(buf, n, "%s.%s", U_OBJECT(o)->pkg_file->name, type); unload(o); @@ -153,7 +153,6 @@ static int deserialize(UObject *uo) f->base += pos; f->len = size; upkg_export_seek(f, 0, SEEK_SET); - priv->f = f; return 0; } -- 2.43.0