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

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

Revision: 3945
          http://sourceforge.net/p/modplug/code/3945
Author:   saga-games
Date:     2014-03-24 02:36:34 +0000 (Mon, 24 Mar 2014)
Log Message:
-----------
[Fix] PAT Loader: Panning flag was not set and loaded files were not converted to the current format's supported capabilities.
[Mod] Pattern creation: Always allow patterns of any size, limitation to format-specific sizes should only be enforced in GUI.
[Mod] OpenMPT: Version is now 1.22.07.32

Modified Paths:
--------------
    trunk/OpenMPT/common/versionNumber.h
    trunk/OpenMPT/soundlib/SampleFormats.cpp
    trunk/OpenMPT/soundlib/patternContainer.cpp

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2014-03-24 02:34:43 UTC (rev 3944)
+++ trunk/OpenMPT/common/versionNumber.h	2014-03-24 02:36:34 UTC (rev 3945)
@@ -17,7 +17,7 @@
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               22
 #define VER_MINOR               07
-#define VER_MINORMINOR          31
+#define VER_MINORMINOR          32
 
 //Version string. For example "1.17.02.28"
 #define MPT_VERSION_STR         VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)

Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp	2014-03-24 02:34:43 UTC (rev 3944)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp	2014-03-24 02:36:34 UTC (rev 3945)
@@ -664,6 +664,7 @@
 	sample.nC5Speed = sampleHeader.freq;
 	sample.nPan = (sampleHeader.balance * 256 + 8) / 15;
 	if(sample.nPan > 256) sample.nPan = 128;
+	else sample.uFlags.set(CHN_PANNING);
 	sample.nVibType = VIB_SINE;
 	sample.nVibSweep = sampleHeader.vibrato_sweep;
 	sample.nVibDepth = sampleHeader.vibrato_depth;
@@ -690,6 +691,7 @@
 		sample.nLoopEnd /= 2;
 	}
 	sampleIO.ReadSample(sample, file);
+	sample.Convert(MOD_TYPE_IT, that->GetType());
 	sample.PrecomputeLoops(*that, false);
 
 	mpt::String::Read<mpt::String::maybeNullTerminated>(that->m_szNames[nSample], sampleHeader.name);
@@ -816,6 +818,8 @@
 			}
 		}
 	}
+
+	pIns->Convert(MOD_TYPE_IT, GetType());
 	return true;
 }
 

Modified: trunk/OpenMPT/soundlib/patternContainer.cpp
===================================================================
--- trunk/OpenMPT/soundlib/patternContainer.cpp	2014-03-24 02:34:43 UTC (rev 3944)
+++ trunk/OpenMPT/soundlib/patternContainer.cpp	2014-03-24 02:36:34 UTC (rev 3945)
@@ -50,7 +50,7 @@
 //---------------------------------------------------------------------------
 {
 	const CModSpecifications& specs = m_rSndFile.GetModSpecifications();
-	if(index >= specs.patternsMax || rows > specs.patternRowsMax || rows == 0)
+	if(index >= specs.patternsMax || rows > MAX_PATTERN_ROWS || rows == 0)
 		return true;
 	if(index < m_Patterns.size() && m_Patterns[index])
 		return true;

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