Mercurial > audlegacy-plugins
diff src/modplug/load_amf.cxx @ 2218:6907fc39b53f
That didn't merge properly. I'll try again at some other point.
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Fri, 07 Dec 2007 12:13:37 -0600 |
| parents | 3673c7ec4ea2 |
| children | 107c1fed3d92 |
line wrap: on
line diff
--- a/src/modplug/load_amf.cxx Fri Dec 07 12:09:16 2007 -0600 +++ b/src/modplug/load_amf.cxx Fri Dec 07 12:13:37 2007 -0600 @@ -1,8 +1,11 @@ /* - * This source code is public domain. + * This program is free software; you can redistribute it and modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the license or (at your + * option) any later version. * * Authors: Olivier Lapicque <olivierl@jps.net> - */ +*/ /////////////////////////////////////////////////// // @@ -220,7 +223,6 @@ if (!p) break; Patterns[iPat] = p; PatternSize[iPat] = 64; - PatternAllocSize[iPat] = 64; const UCHAR *pin = lpStream + dwMemPos; for (UINT i=0; i<8*64; i++) { @@ -312,11 +314,9 @@ { Order[iOrd] = iOrd; PatternSize[iOrd] = 64; - PatternAllocSize[iOrd] = 64; if (pfh->version >= 14) { PatternSize[iOrd] = bswapLE16(*(USHORT *)(lpStream+dwMemPos)); - PatternAllocSize[iOrd] = bswapLE16(*(USHORT *)(lpStream+dwMemPos)); dwMemPos += 2; } ptracks[iOrd] = (USHORT *)(lpStream+dwMemPos); @@ -353,7 +353,8 @@ if ((psh->type) && (bswapLE32(psh->offset) < dwMemLength-1)) { sampleseekpos[iIns] = bswapLE32(psh->offset); - if (bswapLE32(psh->offset) > maxsampleseekpos) maxsampleseekpos = bswapLE32(psh->offset); + if (bswapLE32(psh->offset) > maxsampleseekpos) + maxsampleseekpos = bswapLE32(psh->offset); if ((pins->nLoopEnd > pins->nLoopStart + 2) && (pins->nLoopEnd <= pins->nLength)) pins->uFlags |= CHN_LOOP; } @@ -417,5 +418,3 @@ } return TRUE; } - -