Mercurial > audlegacy-plugins
changeset 82:db47d5ac8f43 trunk
[svn] Always grab FT8 files, they're NOT Amiga MODs. (They are software mixed
on Amiga.)
| author | js |
|---|---|
| date | Wed, 04 Oct 2006 18:21:08 -0700 |
| parents | 254cc9620517 |
| children | 74b4ffde8100 |
| files | ChangeLog src/modplug/modplugbmp.cxx |
| diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 04 01:53:51 2006 -0700 +++ b/ChangeLog Wed Oct 04 18:21:08 2006 -0700 @@ -1,3 +1,11 @@ +2006-10-04 08:53:51 +0000 William Pitcock <nenolod@nenolod.net> + revision [162] + - fix issue where cuesheet plugin owns all codecs + + trunk/src/cue/cuesheet.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + + 2006-10-03 03:58:32 +0000 William Pitcock <nenolod@nenolod.net> revision [160] - parse comments
--- a/src/modplug/modplugbmp.cxx Wed Oct 04 01:53:51 2006 -0700 +++ b/src/modplug/modplugbmp.cxx Wed Oct 04 18:21:08 2006 -0700 @@ -133,9 +133,13 @@ vfs_fclose(file); return 1; } - if(mModProps.mGrabAmigaMOD) { vfs_fseek(file, 1080, SEEK_SET); vfs_fread(magic, 1, 4, file); + if (!memcmp(magic, MOD_MAGIC_FASTTRACKER8, 4)) { + vfs_fclose(file); + return 1; + } + if(mModProps.mGrabAmigaMOD) { if (!memcmp(magic, MOD_MAGIC_PROTRACKER4, 4)) { vfs_fclose(file); return 1; @@ -172,10 +176,6 @@ vfs_fclose(file); return 1; } - if (!memcmp(magic, MOD_MAGIC_FASTTRACKER8, 4)) { - vfs_fclose(file); - return 1; - } if (!memcmp(magic, MOD_MAGIC_OKTALYZER8, 4)) { vfs_fclose(file); return 1;