Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[690] trunk/OpenMPT
|
From: <sag...@us...> - 2010-08-31 21:39:34
|
Revision: 690
http://modplug.svn.sourceforge.net/modplug/?rev=690&view=rev
Author: saga-games
Date: 2010-08-31 21:39:27 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
[Ref] Renamed SONG_ITCOMPATMODE flag to SONG_ITCOMPATGXX for more clarity.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_mt2.cpp
trunk/OpenMPT/soundlib/Load_psm.cpp
trunk/OpenMPT/soundlib/Load_ult.cpp
trunk/OpenMPT/soundlib/Snd_defs.h
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/load_j2b.cpp
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2010-08-26 12:15:34 UTC (rev 689)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2010-08-31 21:39:27 UTC (rev 690)
@@ -269,7 +269,7 @@
ctrlSmp::ResetSamples(m_SndFile, ctrlSmp::SmpResetVibrato);
}
- if (oldTypeIsXM && newTypeIsIT_MPT) m_SndFile.m_dwSongFlags |= SONG_ITCOMPATMODE;
+ if (oldTypeIsXM && newTypeIsIT_MPT) m_SndFile.m_dwSongFlags |= SONG_ITCOMPATGXX;
// Convert IT/MPT to XM (instruments)
if (oldTypeIsIT_MPT && newTypeIsXM)
@@ -388,7 +388,7 @@
AddToLog("WARNING: Linear Frequency Slides not supported by the new format.\n");
m_SndFile.m_dwSongFlags &= ~SONG_LINEARSLIDES;
}
- if (!newTypeIsIT_MPT) m_SndFile.m_dwSongFlags &= ~(SONG_ITOLDEFFECTS|SONG_ITCOMPATMODE);
+ if (!newTypeIsIT_MPT) m_SndFile.m_dwSongFlags &= ~(SONG_ITOLDEFFECTS|SONG_ITCOMPATGXX);
if (!newTypeIsS3M) m_SndFile.m_dwSongFlags &= ~SONG_FASTVOLSLIDES;
if (!newTypeIsMOD) m_SndFile.m_dwSongFlags &= ~SONG_PT1XMODE;
if (newTypeIsS3M || newTypeIsMOD) m_SndFile.m_dwSongFlags &= ~SONG_EXFILTERRANGE;
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2010-08-26 12:15:34 UTC (rev 689)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2010-08-31 21:39:27 UTC (rev 690)
@@ -247,7 +247,7 @@
m_CheckBox1.SetCheck((m_pSndFile->m_dwSongFlags & SONG_LINEARSLIDES) ? MF_CHECKED : 0);
m_CheckBox2.SetCheck((m_pSndFile->m_dwSongFlags & SONG_FASTVOLSLIDES) ? MF_CHECKED : 0);
m_CheckBox3.SetCheck((m_pSndFile->m_dwSongFlags & SONG_ITOLDEFFECTS) ? MF_CHECKED : 0);
- m_CheckBox4.SetCheck((m_pSndFile->m_dwSongFlags & SONG_ITCOMPATMODE) ? MF_CHECKED : 0);
+ m_CheckBox4.SetCheck((m_pSndFile->m_dwSongFlags & SONG_ITCOMPATGXX) ? MF_CHECKED : 0);
m_CheckBox5.SetCheck((m_pSndFile->m_dwSongFlags & SONG_EXFILTERRANGE) ? MF_CHECKED : 0);
m_CheckBoxPT1x.SetCheck((m_pSndFile->m_dwSongFlags & SONG_PT1XMODE) ? MF_CHECKED : 0);
@@ -356,9 +356,9 @@
//--------------------------
{
if (m_CheckBox4.GetCheck())
- m_pSndFile->m_dwSongFlags |= SONG_ITCOMPATMODE;
+ m_pSndFile->m_dwSongFlags |= SONG_ITCOMPATGXX;
else
- m_pSndFile->m_dwSongFlags &= ~SONG_ITCOMPATMODE;
+ m_pSndFile->m_dwSongFlags &= ~SONG_ITCOMPATGXX;
}
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2010-08-26 12:15:34 UTC (rev 689)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2010-08-31 21:39:27 UTC (rev 690)
@@ -563,7 +563,7 @@
if (pifh->flags & 0x08) m_dwSongFlags |= SONG_LINEARSLIDES;
if (pifh->flags & 0x10) m_dwSongFlags |= SONG_ITOLDEFFECTS;
- if (pifh->flags & 0x20) m_dwSongFlags |= SONG_ITCOMPATMODE;
+ if (pifh->flags & 0x20) m_dwSongFlags |= SONG_ITCOMPATGXX;
if ((pifh->flags & 0x80) || (pifh->special & 0x08)) m_dwSongFlags |= SONG_EMBEDMIDICFG;
if (pifh->flags & 0x1000) m_dwSongFlags |= SONG_EXFILTERRANGE;
@@ -1228,7 +1228,7 @@
if (m_nInstruments) header.flags |= 0x04;
if (m_dwSongFlags & SONG_LINEARSLIDES) header.flags |= 0x08;
if (m_dwSongFlags & SONG_ITOLDEFFECTS) header.flags |= 0x10;
- if (m_dwSongFlags & SONG_ITCOMPATMODE) header.flags |= 0x20;
+ if (m_dwSongFlags & SONG_ITCOMPATGXX) header.flags |= 0x20;
if (m_dwSongFlags & SONG_EXFILTERRANGE) header.flags |= 0x1000;
header.globalvol = m_nDefaultGlobalVolume >> 1;
header.mv = CLAMP(m_nSamplePreAmp, 0, 128);
@@ -1862,7 +1862,7 @@
if (m_nInstruments) header.flags |= 0x04;
if (m_dwSongFlags & SONG_LINEARSLIDES) header.flags |= 0x08;
if (m_dwSongFlags & SONG_ITOLDEFFECTS) header.flags |= 0x10;
- if (m_dwSongFlags & SONG_ITCOMPATMODE) header.flags |= 0x20;
+ if (m_dwSongFlags & SONG_ITCOMPATGXX) header.flags |= 0x20;
//if (m_dwSongFlags & SONG_EXFILTERRANGE) header.flags |= 0x1000;
header.globalvol = m_nDefaultGlobalVolume >> 1;
header.mv = CLAMP(m_nSamplePreAmp, 0, 128);
Modified: trunk/OpenMPT/soundlib/Load_mt2.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mt2.cpp 2010-08-26 12:15:34 UTC (rev 689)
+++ trunk/OpenMPT/soundlib/Load_mt2.cpp 2010-08-31 21:39:27 UTC (rev 690)
@@ -201,7 +201,7 @@
m_nRestartPos = pfh->wRestart;
m_nDefaultSpeed = pfh->bTicksPerLine;
m_nDefaultTempo = 125;
- m_dwSongFlags = SONG_ITCOMPATMODE;
+ m_dwSongFlags = SONG_ITCOMPATGXX;
m_nDefaultRowsPerBeat = pfh->bLinesPerBeat;
m_nDefaultRowsPerMeasure = m_nDefaultRowsPerBeat * 4;
if ((pfh->wSamplesPerTick > 100) && (pfh->wSamplesPerTick < 5000))
Modified: trunk/OpenMPT/soundlib/Load_psm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_psm.cpp 2010-08-26 12:15:34 UTC (rev 689)
+++ trunk/OpenMPT/soundlib/Load_psm.cpp 2010-08-31 21:39:27 UTC (rev 690)
@@ -149,7 +149,7 @@
// Yep, this seems to be a valid file.
m_nType = MOD_TYPE_PSM;
- m_dwSongFlags = SONG_ITOLDEFFECTS | SONG_ITCOMPATMODE;
+ m_dwSongFlags = SONG_ITOLDEFFECTS | SONG_ITCOMPATGXX;
SetModFlag(MSF_COMPATIBLE_PLAY, true);
m_nChannels = 0;
Modified: trunk/OpenMPT/soundlib/Load_ult.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ult.cpp 2010-08-26 12:15:34 UTC (rev 689)
+++ trunk/OpenMPT/soundlib/Load_ult.cpp 2010-08-31 21:39:27 UTC (rev 690)
@@ -326,7 +326,7 @@
dwMemPos += 32;
m_nType = MOD_TYPE_ULT;
- m_dwSongFlags = SONG_ITCOMPATMODE | SONG_ITOLDEFFECTS; // this will be converted to IT format by MPT.
+ m_dwSongFlags = SONG_ITCOMPATGXX | SONG_ITOLDEFFECTS; // this will be converted to IT format by MPT.
SetModFlag(MSF_COMPATIBLE_PLAY, true);
ASSERT_CAN_READ(1);
Modified: trunk/OpenMPT/soundlib/Snd_defs.h
===================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h 2010-08-26 12:15:34 UTC (rev 689)
+++ trunk/OpenMPT/soundlib/Snd_defs.h 2010-08-31 21:39:27 UTC (rev 690)
@@ -293,7 +293,7 @@
#define SONG_EMBEDMIDICFG 0x0001 // Embed macros in file
#define SONG_FASTVOLSLIDES 0x0002 // Old Scream Tracker 3.0 volume slides
#define SONG_ITOLDEFFECTS 0x0004 // Old Impulse Tracker effect implementations
-#define SONG_ITCOMPATMODE 0x0008 // IT "Compatible Gxx"
+#define SONG_ITCOMPATGXX 0x0008 // IT "Compatible Gxx" (IT's flag to behave more like other trackers when it comes to portamento effects)
#define SONG_LINEARSLIDES 0x0010 // Linear slides vs. Amiga slides
#define SONG_PATTERNLOOP 0x0020 // Loop current pattern (pattern editor)
#define SONG_STEP 0x0040 // Song is in "step" mode (pattern editor)
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2010-08-26 12:15:34 UTC (rev 689)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2010-08-31 21:39:27 UTC (rev 690)
@@ -557,7 +557,7 @@
// Reset envelopes
if (bResetEnv)
{
- if ((!bPorta) || (!(m_nType & (MOD_TYPE_IT|MOD_TYPE_MPT))) || (m_dwSongFlags & SONG_ITCOMPATMODE)
+ if ((!bPorta) || (!(m_nType & (MOD_TYPE_IT|MOD_TYPE_MPT))) || (m_dwSongFlags & SONG_ITCOMPATGXX)
|| (!pChn->nLength) || ((pChn->dwFlags & CHN_NOTEFADE) && (!pChn->nFadeOutVol))
//IT compatibility tentative fix: Reset envelopes when instrument changes.
|| (IsCompatibleMode(TRK_IMPULSETRACKER) && bInstrumentChanged))
@@ -808,7 +808,7 @@
if ((!bPorta) || (!(m_nType & (MOD_TYPE_IT|MOD_TYPE_MPT)))
|| ((pChn->dwFlags & CHN_NOTEFADE) && (!pChn->nFadeOutVol))
- || ((m_dwSongFlags & SONG_ITCOMPATMODE) && (pChn->nRowInstr)))
+ || ((m_dwSongFlags & SONG_ITCOMPATGXX) && (pChn->nRowInstr)))
{
if ((m_nType & (MOD_TYPE_IT|MOD_TYPE_MPT)) && (pChn->dwFlags & CHN_NOTEFADE) && (!pChn->nFadeOutVol))
{
@@ -818,7 +818,7 @@
pChn->dwFlags &= ~CHN_NOTEFADE;
pChn->nFadeOutVol = 65536;
}
- if ((!bPorta) || (!(m_dwSongFlags & SONG_ITCOMPATMODE)) || (pChn->nRowInstr))
+ if ((!bPorta) || (!(m_dwSongFlags & SONG_ITCOMPATGXX)) || (pChn->nRowInstr))
{
if ((!(m_nType & (MOD_TYPE_XM|MOD_TYPE_MT2))) || (pChn->nRowInstr))
{
@@ -2319,7 +2319,7 @@
pChn->dwFlags |= CHN_PORTAMENTO;
//IT compatibility 03
- if(!(m_dwSongFlags & SONG_ITCOMPATMODE) && IsCompatibleMode(TRK_IMPULSETRACKER))
+ if(!(m_dwSongFlags & SONG_ITCOMPATGXX) && IsCompatibleMode(TRK_IMPULSETRACKER))
{
if(param == 0) param = pChn->nOldPortaUpDown;
pChn->nOldPortaUpDown = param;
Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp 2010-08-26 12:15:34 UTC (rev 689)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp 2010-08-31 21:39:27 UTC (rev 690)
@@ -488,7 +488,7 @@
memcpy(m_szNames[0], mainchunk->songname, 32);
SpaceToNullStringFixed(m_szNames[0], 31);
- m_dwSongFlags = SONG_ITOLDEFFECTS | SONG_ITCOMPATMODE;
+ m_dwSongFlags = SONG_ITOLDEFFECTS | SONG_ITCOMPATGXX;
if(!(mainchunk->flags & 0x01)) m_dwSongFlags |= SONG_LINEARSLIDES;
if(mainchunk->channels < 1) return false;
m_nChannels = min(mainchunk->channels, MAX_BASECHANNELS);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
