# HG changeset patch # User js # Date 1160011268 25200 # Node ID db47d5ac8f437c67c07e2f7d15bf08825c1409ed # Parent 254cc9620517a9b20f774590204df6cfbe84b637 [svn] Always grab FT8 files, they're NOT Amiga MODs. (They are software mixed on Amiga.) diff -r 254cc9620517 -r db47d5ac8f43 ChangeLog --- 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 + 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 revision [160] - parse comments diff -r 254cc9620517 -r db47d5ac8f43 src/modplug/modplugbmp.cxx --- 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;