[OMPT-svn-commit] SF.net SVN: modplug:[3062] trunk/OpenMPT/soundlib

[<sag...@us...>]

Revision: 3062
          http://sourceforge.net/p/modplug/code/3062
Author:   saga-games
Date:     2013-11-01 16:29:11 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
[Mod] Re-enable reading of ADPCM-compressed samples in MOD loader.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Load_mod.cpp
    trunk/OpenMPT/soundlib/Load_ptm.cpp

Modified: trunk/OpenMPT/soundlib/Load_mod.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp	2013-10-29 22:28:54 UTC (rev 3061)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp	2013-11-01 16:29:11 UTC (rev 3062)
@@ -708,7 +708,12 @@
 	{
 		for(SAMPLEINDEX smp = 1; smp <= 31; smp++)
 		{
-			MODSampleHeader::GetSampleFormat().ReadSample(Samples[smp], file);
+			SampleIO(
+				SampleIO::_8bit,
+				SampleIO::mono,
+				SampleIO::bigEndian,
+				file.ReadMagic("ADPCM") ? SampleIO::ADPCM : SampleIO::signedPCM)
+				.ReadSample(Samples[smp], file);
 		}
 	}
 

Modified: trunk/OpenMPT/soundlib/Load_ptm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ptm.cpp	2013-10-29 22:28:54 UTC (rev 3061)
+++ trunk/OpenMPT/soundlib/Load_ptm.cpp	2013-11-01 16:29:11 UTC (rev 3062)
@@ -194,7 +194,7 @@
 	}
 
 	// Reading Patterns
-	if(!(loadFlags && loadPatternData))
+	if(!(loadFlags & loadPatternData))
 	{
 		return true;
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.