diff options
| author | Matthias Drochner <M.Drochner@fz-juelich.de> | 2009-01-28 19:13:44 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-30 17:51:16 +0100 |
| commit | 5b85288664f6f45172bb812a739e9b0cc8f1e974 (patch) | |
| tree | b697178e3992c147e8d8a60fbf3d850d85d19342 /src/decoder/mikmod_plugin.c | |
| parent | 02bfb0c4e4271cdaa264a974c52cf49114a90ac5 (diff) | |
| download | mpd-5b85288664f6f45172bb812a739e9b0cc8f1e974.tar.gz mpd-5b85288664f6f45172bb812a739e9b0cc8f1e974.tar.xz mpd-5b85288664f6f45172bb812a739e9b0cc8f1e974.zip | |
mikmod: call MikMod_Exit() only in the finish() method
Hi -
independently of libmikmod's other problems - there seems
to be a problem in mpd's wrapper: MikMod_Exit() is called
after the first file is decoded, which frees some ressources
within the mikmod library. An attempt to play a second file
leads to a crash. The appended patch fixes this for me.
(I don't know what the "dup" entry is good for - someone
who knows should review that too.)
best regards
Matthias
[mk: removed 3 more MikMod_Exit() invocations]
Diffstat (limited to 'src/decoder/mikmod_plugin.c')
| -rw-r--r-- | src/decoder/mikmod_plugin.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/decoder/mikmod_plugin.c b/src/decoder/mikmod_plugin.c index 2fce23f7d..ad308dbe4 100644 --- a/src/decoder/mikmod_plugin.c +++ b/src/decoder/mikmod_plugin.c @@ -167,7 +167,6 @@ mod_decode(struct decoder *decoder, const char *path) if (!(data = mod_open(path))) { g_warning("failed to open mod: %s\n", path); - MikMod_Exit(); return; } @@ -190,8 +189,6 @@ mod_decode(struct decoder *decoder, const char *path) } mod_close(data); - - MikMod_Exit(); } static struct tag *modTagDup(const char *file) @@ -207,7 +204,6 @@ static struct tag *modTagDup(const char *file) if (moduleHandle == NULL) { g_debug("modTagDup: Failed to open file: %s\n", file); - MikMod_Exit(); return NULL; } @@ -223,8 +219,6 @@ static struct tag *modTagDup(const char *file) if (title) tag_add_item(ret, TAG_ITEM_TITLE, title); - MikMod_Exit(); - return ret; } |