Mercurial > audlegacy-plugins
changeset 83:74b4ffde8100 trunk
[svn] The same change like for the FT8 MODs, but this time for FT6 MODs.
(Sorry, I forget to move them as well.)
| author | js |
|---|---|
| date | Wed, 04 Oct 2006 18:24:55 -0700 |
| parents | db47d5ac8f43 |
| children | fa9e4ed85309 |
| files | ChangeLog src/modplug/modplugbmp.cxx |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 04 18:21:08 2006 -0700 +++ b/ChangeLog Wed Oct 04 18:24:55 2006 -0700 @@ -1,3 +1,12 @@ +2006-10-05 01:21:08 +0000 Jonathan Schleifer <js@h3c.de> + revision [164] + Always grab FT8 files, they're NOT Amiga MODs. (They are software mixed + on Amiga.) + + trunk/src/modplug/modplugbmp.cxx | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + + 2006-10-04 08:53:51 +0000 William Pitcock <nenolod@nenolod.net> revision [162] - fix issue where cuesheet plugin owns all codecs
--- a/src/modplug/modplugbmp.cxx Wed Oct 04 18:21:08 2006 -0700 +++ b/src/modplug/modplugbmp.cxx Wed Oct 04 18:24:55 2006 -0700 @@ -135,6 +135,10 @@ } vfs_fseek(file, 1080, SEEK_SET); vfs_fread(magic, 1, 4, file); + if (!memcmp(magic, MOD_MAGIC_FASTTRACKER6, 4)) { + vfs_fclose(file); + return 1; + } if (!memcmp(magic, MOD_MAGIC_FASTTRACKER8, 4)) { vfs_fclose(file); return 1; @@ -172,10 +176,6 @@ vfs_fclose(file); return 1; } - if (!memcmp(magic, MOD_MAGIC_FASTTRACKER6, 4)) { - vfs_fclose(file); - return 1; - } if (!memcmp(magic, MOD_MAGIC_OKTALYZER8, 4)) { vfs_fclose(file); return 1;