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

[<man...@us...>]

Revision: 2522
          http://sourceforge.net/p/modplug/code/2522
Author:   manxorist
Date:     2013-07-08 00:32:18 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
[Fix] Loading .wav files as modules broke in r2438 .

Revision Links:
--------------
    http://sourceforge.net/p/modplug/code/2438

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Load_wav.cpp
    trunk/OpenMPT/soundlib/SampleFormatConverters.h

Modified: trunk/OpenMPT/soundlib/Load_wav.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_wav.cpp	2013-07-08 00:13:03 UTC (rev 2521)
+++ trunk/OpenMPT/soundlib/Load_wav.cpp	2013-07-08 00:32:18 UTC (rev 2522)
@@ -26,7 +26,7 @@
 	ASSERT(sample.GetNumChannels() == 1);
 	ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConverter::output_t));
 
-	const size_t offset = channelIndex * sizeof(typename SampleConverter::input_t);
+	const size_t offset = channelIndex * sizeof(typename SampleConverter::input_t) * SampleConverter::input_inc;
 
 	if(sample.AllocateSample() == 0 || !file.CanRead(offset))
 	{

Modified: trunk/OpenMPT/soundlib/SampleFormatConverters.h
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormatConverters.h	2013-07-08 00:13:03 UTC (rev 2521)
+++ trunk/OpenMPT/soundlib/SampleFormatConverters.h	2013-07-08 00:32:18 UTC (rev 2522)
@@ -441,7 +441,7 @@
 // SampleConversion: Functor of type SampleConversionFunctor to apply sample conversion (see above for existing functors).
 template <typename SampleConversion>
 size_t CopySample(typename SampleConversion::output_t *outBuf, size_t numSamples, size_t incTarget, const typename SampleConversion::input_t *inBuf, size_t sourceSize, size_t incSource)
-//---------------------------------------------------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 {
 	const size_t sampleSize = incSource * SampleConversion::input_inc;
 	LimitMax(numSamples, sourceSize / sampleSize);
@@ -462,7 +462,7 @@
 // Copy a mono sample data buffer.
 template <typename SampleConversion>
 size_t CopyMonoSample(ModSample &sample, const char *sourceBuffer, size_t sourceSize)
-//------------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------------
 {
 	ASSERT(sample.GetNumChannels() == 1);
 	ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
@@ -486,7 +486,7 @@
 // Copy a stereo interleaved sample data buffer.
 template <typename SampleConversion>
 size_t CopyStereoInterleavedSample(ModSample &sample, const char *sourceBuffer, size_t sourceSize)
-//-------------------------------------------------------------------------------------------------
+//------------------------------------------------------------------------------------------------
 {
 	ASSERT(sample.GetNumChannels() == 2);
 	ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
@@ -514,7 +514,7 @@
 // Copy a stereo split sample data buffer.
 template <typename SampleConversion>
 size_t CopyStereoSplitSample(ModSample &sample, const char *sourceBuffer, size_t sourceSize)
-//-------------------------------------------------------------------------------------------
+//------------------------------------------------------------------------------------------
 {
 	ASSERT(sample.GetNumChannels() == 2);
 	ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
@@ -543,7 +543,7 @@
 // Copy a sample data buffer and normalize it. Requires slightly advanced sample conversion functor.
 template<typename SampleConversion>
 size_t CopyAndNormalizeSample(ModSample &sample, const char *sourceBuffer, size_t sourceSize)
-//--------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------
 {
 	const size_t inSize = sizeof(typename SampleConversion::input_t);
 

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