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

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

Revision: 1604
          http://sourceforge.net/p/modplug/code/1604
Author:   saga-games
Date:     2013-03-19 22:48:56 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
[Mod] Instrument Editor: Filter mode is now also disabled for IT modules.
[Mod] OpenMPT: Version is now 1.21.01.23

Modified Paths:
--------------
    trunk/OpenMPT/common/version.h
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/soundlib/ModInstrument.cpp

Modified: trunk/OpenMPT/common/version.h
===================================================================
--- trunk/OpenMPT/common/version.h	2013-03-19 21:44:23 UTC (rev 1603)
+++ trunk/OpenMPT/common/version.h	2013-03-19 22:48:56 UTC (rev 1604)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					21
 #define VER_MINOR					01
-#define VER_MINORMINOR				22
+#define VER_MINORMINOR				23
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2013-03-19 21:44:23 UTC (rev 1603)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2013-03-19 22:48:56 UTC (rev 1604)
@@ -1226,9 +1226,6 @@
 		m_ComboNNA.EnableWindow(bITandMPT);
 		m_SliderVolSwing.EnableWindow(bITandMPT);
 		m_SliderPanSwing.EnableWindow(bITandMPT);
-		m_SliderCutSwing.EnableWindow((m_pSndFile->GetType() == MOD_TYPE_MPT || (pIns != nullptr && pIns->nCutSwing != 0)) ? TRUE : FALSE);
-		m_SliderResSwing.EnableWindow((m_pSndFile->GetType() == MOD_TYPE_MPT || (pIns != nullptr && pIns->nResSwing != 0)) ? TRUE : FALSE);
-		m_CbnFilterMode.EnableWindow(bITandMPT);
 		m_ComboDCT.EnableWindow(bITandMPT);
 		m_ComboDCA.EnableWindow(bITandMPT);
 		m_ComboPPC.EnableWindow(bITandMPT);
@@ -1267,6 +1264,11 @@
 	}
 	if (dwHintMask & (HINT_INSTRUMENT|HINT_MODTYPE))
 	{
+		// Backwards compatibility with IT modules that use now deprecated hack features.
+		m_SliderCutSwing.EnableWindow((pIns != nullptr && (m_pSndFile->GetType() == MOD_TYPE_MPT || pIns->nCutSwing != 0)) ? TRUE : FALSE);
+		m_SliderResSwing.EnableWindow((pIns != nullptr && (m_pSndFile->GetType() == MOD_TYPE_MPT || pIns->nResSwing != 0)) ? TRUE : FALSE);
+		m_CbnFilterMode.EnableWindow((pIns != nullptr && (m_pSndFile->GetType() == MOD_TYPE_MPT || pIns->nFilterMode != FLTMODE_UNCHANGED)) ? TRUE : FALSE);
+
 		CHAR s[128];
 		if (pIns)
 		{

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-03-19 21:44:23 UTC (rev 1603)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-03-19 22:48:56 UTC (rev 1604)
@@ -251,7 +251,7 @@
 	}
 
 	// GUI Stuff
-	m_ShowSplashScreen = CMainFrame::GetPrivateProfileLong("Display", "ShowSplashScreen", m_ShowSplashScreen, iniFile);
+	m_ShowSplashScreen = !!CMainFrame::GetPrivateProfileLong("Display", "ShowSplashScreen", m_ShowSplashScreen, iniFile);
 	gbMdiMaximize = CMainFrame::GetPrivateProfileLong("Display", "MDIMaximize", gbMdiMaximize, iniFile);
 	glTreeWindowWidth = CMainFrame::GetPrivateProfileLong("Display", "MDITreeWidth", glTreeWindowWidth, iniFile);
 	glTreeSplitRatio = CMainFrame::GetPrivateProfileLong("Display", "MDITreeRatio", glTreeSplitRatio, iniFile);

Modified: trunk/OpenMPT/soundlib/ModInstrument.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModInstrument.cpp	2013-03-19 21:44:23 UTC (rev 1603)
+++ trunk/OpenMPT/soundlib/ModInstrument.cpp	2013-03-19 22:48:56 UTC (rev 1604)
@@ -217,12 +217,13 @@
 		LimitMax(nFadeOut, 8192u);
 	}
 
-	// MPT-specific features - remove instrument tunings, Pitch/Tempo Lock for other formats
+	// MPT-specific features - remove instrument tunings, Pitch/Tempo Lock, cutoff / resonance swing and filter mode for other formats
 	if(!(toType & MOD_TYPE_MPT))
 	{
 		SetTuning(nullptr);
 		wPitchToTempoLock = 0;
 		nCutSwing = nResSwing = 0;
+		nFilterMode = FLTMODE_UNCHANGED;
 	}
 }
 

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