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

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

Revision: 5153
          http://sourceforge.net/p/modplug/code/5153
Author:   saga-games
Date:     2015-05-24 17:23:30 +0000 (Sun, 24 May 2015)
Log Message:
-----------
[Fix] Previewing samples from UAX files in the tree view played them at the wrong frequency.
[Ref] Small non-functional changes in Load_it.cpp

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Load_it.cpp
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2015-05-24 09:45:49 UTC (rev 5152)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2015-05-24 17:23:30 UTC (rev 5153)
@@ -25,7 +25,6 @@
 #include "../common/mptFileIO.h"
 #endif
 #include <sstream>
-#include <list>
 #include "../common/version.h"
 #include "ITTools.h"
 #include <time.h>
@@ -92,7 +91,7 @@
 		TNTS_MAP tNameToShort_Map;
 
 		unsigned short figMap = 0;
-		for(UINT i = 1; i <= sf.GetNumInstruments(); i++) if (sf.Instruments[i] != nullptr)
+		for(INSTRUMENTINDEX i = 1; i <= sf.GetNumInstruments(); i++) if (sf.Instruments[i] != nullptr)
 		{
 			TNTS_MAP_ITER iter = tNameToShort_Map.find(sf.Instruments[i]->pTuning);
 			if(iter != tNameToShort_Map.end())
@@ -170,7 +169,7 @@
 	ReadTuningMapTemplate<uint16, uint8>(iStrm, shortToTNameMap);
 
 	//Read & set tunings for instruments
-	std::list<std::string> notFoundTunings;
+	std::vector<std::string> notFoundTunings;
 	for(UINT i = 1; i<=csf.GetNumInstruments(); i++)
 	{
 		uint16 ui;
@@ -180,7 +179,7 @@
 		{
 			const std::string str = iter->second;
 
-			if(str == std::string("->MPT_ORIGINAL_IT<-"))
+			if(str == "->MPT_ORIGINAL_IT<-")
 			{
 				csf.Instruments[i]->pTuning = nullptr;
 				continue;
@@ -207,8 +206,8 @@
 				continue;
 
 			//Checking if not found tuning already noticed.
-			std::list<std::string>::iterator iter;
-			iter = find(notFoundTunings.begin(), notFoundTunings.end(), str);
+			std::vector<std::string>::iterator iter;
+			iter = std::find(notFoundTunings.begin(), notFoundTunings.end(), str);
 			if(iter == notFoundTunings.end())
 			{
 				notFoundTunings.push_back(str);
@@ -224,9 +223,9 @@
 			}
 			csf.Instruments[i]->pTuning = csf.GetDefaultTuning();
 
-		}
-		else //This 'else' happens probably only in case of corrupted file.
+		} else
 		{
+			//This 'else' happens probably only in case of corrupted file.
 			if(csf.Instruments[i])
 				csf.Instruments[i]->pTuning = csf.GetDefaultTuning();
 		}

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2015-05-24 09:45:49 UTC (rev 5152)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2015-05-24 17:23:30 UTC (rev 5153)
@@ -5185,7 +5185,7 @@
 	if (note == NOTE_NONE || (note >= NOTE_MIN_SPECIAL)) return 0;
 	note -= NOTE_MIN;
 	if (GetType() & (MOD_TYPE_IT|MOD_TYPE_MPT|MOD_TYPE_MT2|MOD_TYPE_S3M|MOD_TYPE_STM|MOD_TYPE_MDL|MOD_TYPE_ULT|MOD_TYPE_WAV|MOD_TYPE_669|MOD_TYPE_PLM
-				|MOD_TYPE_FAR|MOD_TYPE_DMF|MOD_TYPE_PTM|MOD_TYPE_AMS|MOD_TYPE_AMS2|MOD_TYPE_DBM|MOD_TYPE_AMF|MOD_TYPE_PSM|MOD_TYPE_J2B|MOD_TYPE_IMF))
+				|MOD_TYPE_FAR|MOD_TYPE_DMF|MOD_TYPE_PTM|MOD_TYPE_AMS|MOD_TYPE_AMS2|MOD_TYPE_DBM|MOD_TYPE_AMF|MOD_TYPE_PSM|MOD_TYPE_J2B|MOD_TYPE_IMF|MOD_TYPE_UAX))
 	{
 		if(m_SongFlags[SONG_LINEARSLIDES])
 		{
@@ -5198,8 +5198,7 @@
 			return Util::muldiv_unsigned(8363, (FreqS3MTable[note % 12] << 5), nC5Speed << (note / 12));
 			//8363 * freq[note%12] / nC5Speed * 2^(5-note/12)
 		}
-	} else
-	if (GetType() == MOD_TYPE_XM)
+	} else if (GetType() == MOD_TYPE_XM)
 	{
 		if (note < 12) note = 12;
 		note -= 12;

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