Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4787] trunk/OpenMPT
|
From: <sag...@us...> - 2015-02-22 16:19:04
|
Revision: 4787
http://sourceforge.net/p/modplug/code/4787
Author: saga-games
Date: 2015-02-22 16:18:51 +0000 (Sun, 22 Feb 2015)
Log Message:
-----------
[Fix] Something made be believe that out-of-range global volume commands are ignored in XM. Undo previous fix (which is as old as OpenMPT 1.17.03.02). Modules made with OpenMPT since this version are now auto-fixed instead of old modules. Fixed "Reflecter" by Zodiak.
[Mod] OpenMPT: Version is now 1.24.02.02
Modified Paths:
--------------
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/UpgradeModule.cpp
Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h 2015-02-22 13:11:53 UTC (rev 4786)
+++ trunk/OpenMPT/common/versionNumber.h 2015-02-22 16:18:51 UTC (rev 4787)
@@ -19,7 +19,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 24
#define VER_MINOR 02
-#define VER_MINORMINOR 01
+#define VER_MINORMINOR 02
//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/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2015-02-22 13:11:53 UTC (rev 4786)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2015-02-22 16:18:51 UTC (rev 4787)
@@ -519,10 +519,13 @@
// }
if(!(GetType() & GLOBALVOL_7BIT_FORMATS)) param <<= 1;
- // IT compatibility 16. FT2, ST3 and IT ignore out-of-range values
+ // IT compatibility 16. ST3 and IT ignore out-of-range values
if(param <= 128)
{
memory.state.m_nGlobalVolume = param << 1;
+ } else if(!(GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT | MOD_TYPE_S3M)))
+ {
+ memory.state.m_nGlobalVolume = 256;
}
break;
// Global Volume Slide
@@ -2711,11 +2714,14 @@
if (!(GetType() & GLOBALVOL_7BIT_FORMATS)) param *= 2;
- // IT compatibility 16. FT2, ST3 and IT ignore out-of-range values.
+ // IT compatibility 16. ST3 and IT ignore out-of-range values.
// Test case: globalvol-invalid.it
- if (param <= 128)
+ if(param <= 128)
{
m_PlayState.m_nGlobalVolume = param * 2;
+ } else if(!(GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT | MOD_TYPE_S3M)))
+ {
+ m_PlayState.m_nGlobalVolume = 256;
}
break;
Modified: trunk/OpenMPT/soundlib/UpgradeModule.cpp
===================================================================
--- trunk/OpenMPT/soundlib/UpgradeModule.cpp 2015-02-22 13:11:53 UTC (rev 4786)
+++ trunk/OpenMPT/soundlib/UpgradeModule.cpp 2015-02-22 16:18:51 UTC (rev 4787)
@@ -70,32 +70,44 @@
return;
}
- if(sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 17, 03, 02) ||
- (!sndFile.IsCompatibleMode(TRK_ALLTRACKERS) && sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 20, 00, 00)))
+ if(sndFile.GetType() == MOD_TYPE_S3M)
{
- if(m.command == CMD_GLOBALVOLUME)
+ // Out-of-range global volume commands should be ignored in S3M. Fixed in OpenMPT 1.19 (r831).
+ // So for tracks made with older versions of OpenMPT, we limit invalid global volume commands.
+ if(sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 19, 00, 00) && m.command == CMD_GLOBALVOLUME)
{
- // Out-of-range global volume commands should be ignored.
- // OpenMPT 1.17.03.02 fixed this in compatible mode, OpenMPT 1.20 fixes it in normal mode as well.
- // So for tracks made with older versions than OpenMPT 1.17.03.02 or tracks made with 1.17.03.02 <= version < 1.20, we limit invalid global volume commands.
- LimitMax(m.param, ModCommand::PARAM((sndFile.GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)) ? 128: 64));
- } else if(m.command == CMD_S3MCMDEX && (sndFile.GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)))
+ LimitMax(m.param, ModCommand::PARAM(64));
+ }
+ }
+
+ else if((sndFile.GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)))
+ {
+ if(sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 17, 03, 02) ||
+ (!sndFile.IsCompatibleMode(TRK_IMPULSETRACKER) && sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 20, 00, 00)))
{
+ if(m.command == CMD_GLOBALVOLUME)
+ {
+ // Out-of-range global volume commands should be ignored in IT.
+ // OpenMPT 1.17.03.02 fixed this in compatible mode, OpenMPT 1.20 fixes it in normal mode as well.
+ // So for tracks made with older versions than OpenMPT 1.17.03.02 or tracks made with 1.17.03.02 <= version < 1.20, we limit invalid global volume commands.
+ LimitMax(m.param, ModCommand::PARAM(128));
+ }
+
// SC0 and SD0 should be interpreted as SC1 and SD1 in IT files.
// OpenMPT 1.17.03.02 fixed this in compatible mode, OpenMPT 1.20 fixes it in normal mode as well.
- if(m.param == 0xC0)
+ else if(m.command == CMD_S3MCMDEX)
{
- m.command = CMD_NONE;
- m.note = NOTE_NOTECUT;
- } else if(m.param == 0xD0)
- {
- m.command = CMD_NONE;
+ if(m.param == 0xC0)
+ {
+ m.command = CMD_NONE;
+ m.note = NOTE_NOTECUT;
+ } else if(m.param == 0xD0)
+ {
+ m.command = CMD_NONE;
+ }
}
}
- }
- if((sndFile.GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)))
- {
// In the IT format, slide commands with both nibbles set should be ignored.
// For note volume slides, OpenMPT 1.18 fixes this in compatible mode, OpenMPT 1.20 fixes this in normal mode as well.
const bool noteVolSlide =
@@ -129,6 +141,50 @@
}
}
+ else if(sndFile.GetType() == MOD_TYPE_XM)
+ {
+ // Something made be believe that out-of-range global volume commands are ignored in XM
+ // just like they are ignored in IT, but apparently they are not. Aaaaaargh!
+ if(((sndFile.m_dwLastSavedWithVersion >= MAKE_VERSION_NUMERIC(1, 17, 03, 02) && sndFile.IsCompatibleMode(TRK_FASTTRACKER2)) || (sndFile.m_dwLastSavedWithVersion >= MAKE_VERSION_NUMERIC(1, 20, 00, 00)))
+ && sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 24, 02, 02)
+ && m.command == CMD_GLOBALVOLUME
+ && m.param > 64)
+ {
+ m.command = CMD_NONE;
+ }
+
+ if(sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 19, 00, 00)
+ || (!sndFile.IsCompatibleMode(TRK_FASTTRACKER2) && sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 20, 00, 00)))
+ {
+ if(m.command == CMD_OFFSET && m.volcmd == VOLCMD_TONEPORTAMENTO)
+ {
+ // If there are both a portamento and an offset effect, the portamento should be preferred in XM files.
+ // OpenMPT 1.19 fixed this in compatible mode, OpenMPT 1.20 fixes it in normal mode as well.
+ m.command = CMD_NONE;
+ }
+ }
+
+ if(sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 20, 01, 10)
+ && sndFile.m_dwLastSavedWithVersion != MAKE_VERSION_NUMERIC(1, 20, 00, 00) // Ignore compatibility export
+ && m.volcmd == VOLCMD_TONEPORTAMENTO && m.command == CMD_TONEPORTAMENTO
+ && (m.vol != 0 || sndFile.IsCompatibleMode(TRK_FASTTRACKER2)) && m.param != 0)
+ {
+ // Mx and 3xx on the same row does weird things in FT2: 3xx is completely ignored and the Mx parameter is doubled. Fixed in revision 1312 / OpenMPT 1.20.01.10
+ // Previously the values were just added up, so let's fix this!
+ m.volcmd = VOLCMD_NONE;
+ const uint16 param = static_cast<uint16>(m.param) + static_cast<uint16>(m.vol << 4);
+ m.param = mpt::saturate_cast<ModCommand::PARAM>(param);
+ }
+
+ if(sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 22, 07, 09)
+ && sndFile.m_dwLastSavedWithVersion != MAKE_VERSION_NUMERIC(1, 22, 00, 00) // Ignore compatibility export
+ && m.command == CMD_SPEED && m.param == 0)
+ {
+ // OpenMPT can emulate FT2's F00 behaviour now.
+ m.command = CMD_NONE;
+ }
+ }
+
if(sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 20, 00, 00))
{
// Pattern Delay fixes
@@ -167,40 +223,6 @@
}
}
- if(sndFile.GetType() == MOD_TYPE_XM)
- {
- if(sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 19, 00, 00)
- || (!sndFile.IsCompatibleMode(TRK_FASTTRACKER2) && sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 20, 00, 00)))
- {
- if(m.command == CMD_OFFSET && m.volcmd == VOLCMD_TONEPORTAMENTO)
- {
- // If there are both a portamento and an offset effect, the portamento should be preferred in XM files.
- // OpenMPT 1.19 fixed this in compatible mode, OpenMPT 1.20 fixes it in normal mode as well.
- m.command = CMD_NONE;
- }
- }
-
- if(sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 20, 01, 10)
- && sndFile.m_dwLastSavedWithVersion != MAKE_VERSION_NUMERIC(1, 20, 00, 00) // Ignore compatibility export
- && m.volcmd == VOLCMD_TONEPORTAMENTO && m.command == CMD_TONEPORTAMENTO
- && (m.vol != 0 || sndFile.IsCompatibleMode(TRK_FASTTRACKER2)) && m.param != 0)
- {
- // Mx and 3xx on the same row does weird things in FT2: 3xx is completely ignored and the Mx parameter is doubled. Fixed in revision 1312 / OpenMPT 1.20.01.10
- // Previously the values were just added up, so let's fix this!
- m.volcmd = VOLCMD_NONE;
- const uint16 param = static_cast<uint16>(m.param) + static_cast<uint16>(m.vol << 4);
- m.param = mpt::saturate_cast<ModCommand::PARAM>(param);
- }
-
- if(sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 22, 07, 09)
- && sndFile.m_dwLastSavedWithVersion != MAKE_VERSION_NUMERIC(1, 22, 00, 00) // Ignore compatibility export
- && m.command == CMD_SPEED && m.param == 0)
- {
- // OpenMPT can emulate FT2's F00 behaviour now.
- m.command = CMD_NONE;
- }
- }
-
// Volume column offset in IT/XM is bad, mkay?
if(sndFile.GetType() != MOD_TYPE_MPT && m.volcmd == VOLCMD_OFFSET && m.command == CMD_NONE)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
