# HG changeset patch # User nenolod # Date 1160012531 25200 # Node ID fa9e4ed85309024b5d2ca789bb01ff84cab2bc40 # Parent 74b4ffde81002cfb6ad5d5f08b408ae258e40c09 [svn] - try this diff -r 74b4ffde8100 -r fa9e4ed85309 ChangeLog --- a/ChangeLog Wed Oct 04 18:24:55 2006 -0700 +++ b/ChangeLog Wed Oct 04 18:42:11 2006 -0700 @@ -1,3 +1,12 @@ +2006-10-05 01:24:55 +0000 Jonathan Schleifer + revision [166] + The same change like for the FT8 MODs, but this time for FT6 MODs. + (Sorry, I forget to move them as well.) + + trunk/src/modplug/modplugbmp.cxx | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + + 2006-10-05 01:21:08 +0000 Jonathan Schleifer revision [164] Always grab FT8 files, they're NOT Amiga MODs. (They are software mixed diff -r 74b4ffde8100 -r fa9e4ed85309 src/alac/demux.c --- a/src/alac/demux.c Wed Oct 04 18:24:55 2006 -0700 +++ b/src/alac/demux.c Wed Oct 04 18:42:11 2006 -0700 @@ -45,6 +45,7 @@ stream_t *stream; demux_res_t *res; long saved_mdat_pos; + int isfilenotalac; } qtmovie_t; @@ -243,7 +244,10 @@ stream_skip(qtmovie->stream, entry_remaining); if (qtmovie->res->format != MAKEFOURCC('a','l','a','c')) + { + qtmovie->isfilenotalac = 1; return; + } } } @@ -648,6 +652,7 @@ /* construct the stream */ qtmovie->stream = file; qtmovie->res = demux_res; + qtmovie->isfilenotalac = 0; memset(demux_res, 0, sizeof(demux_res_t)); @@ -701,7 +706,8 @@ } } - return 0; + + return qtmovie->isfilenotalac; }