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

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

Revision: 3987
          http://sourceforge.net/p/modplug/code/3987
Author:   manxorist
Date:     2014-03-28 16:03:39 +0000 (Fri, 28 Mar 2014)
Log Message:
-----------
[Fix] Repair logic when to save comrpessed IT samples (broken since r3757 ).

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

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.h
    trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2014-03-28 14:28:45 UTC (rev 3986)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2014-03-28 16:03:39 UTC (rev 3987)
@@ -158,8 +158,8 @@
 	, defaultModType(conf, "Misc", "DefaultModType", MOD_TYPE_IT)
 	, DefaultPlugVolumeHandling(conf, "Misc", "DefaultPlugVolumeHandling", PLUGIN_VOLUMEHANDLING_IGNORE)
 	, autoApplySmoothFT2Ramping(conf, "Misc", "SmoothFT2Ramping", false)
-	, MiscITCompressionStereo(conf, "Misc", "ITCompressionStereo", false)
-	, MiscITCompressionMono(conf, "Misc", "ITCompressionMono", false)
+	, MiscITCompressionStereo(conf, "Misc", "ITCompressionStereo", 0)
+	, MiscITCompressionMono(conf, "Misc", "ITCompressionMono", 0)
 	// Sound Settings
 	, m_SoundSampleRates(conf, "Sound Settings", "SampleRates", GetDefaultSampleRates())
 	, m_MorePortaudio(conf, "Sound Settings", "MorePortaudio", false)

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	2014-03-28 14:28:45 UTC (rev 3986)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	2014-03-28 16:03:39 UTC (rev 3987)
@@ -358,8 +358,8 @@
 	Setting<MODTYPE> defaultModType;
 	Setting<PLUGVOLUMEHANDLING> DefaultPlugVolumeHandling;
 	Setting<bool> autoApplySmoothFT2Ramping;
-	Setting<bool> MiscITCompressionStereo;
-	Setting<bool> MiscITCompressionMono;
+	Setting<uint32> MiscITCompressionStereo; // Mask: bit0: IT, bit1: Compat IT, bit2: MPTM
+	Setting<uint32> MiscITCompressionMono;   // Mask: bit0: IT, bit1: Compat IT, bit2: MPTM
 
 	// Sound Settings
 	

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2014-03-28 14:28:45 UTC (rev 3986)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2014-03-28 16:03:39 UTC (rev 3987)
@@ -1564,7 +1564,7 @@
 #ifdef MODPLUG_TRACKER
 		int type = GetType() == MOD_TYPE_IT ? 1 : 4;
 		if(compatibilityExport) type = 2;
-		bool compress = (Samples[nsmp].GetNumChannels() > 1) ? TrackerSettings::Instance().MiscITCompressionStereo : TrackerSettings::Instance().MiscITCompressionMono;
+		bool compress = ((((Samples[nsmp].GetNumChannels() > 1) ? TrackerSettings::Instance().MiscITCompressionStereo : TrackerSettings::Instance().MiscITCompressionMono) & type) != 0);
 #else
 		bool compress = false;
 #endif // MODPLUG_TRACKER

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