Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1344] trunk/OpenMPT/soundlib/Snd_fx.cpp
|
From: <sag...@us...> - 2012-08-20 23:42:55
|
Revision: 1344
http://modplug.svn.sourceforge.net/modplug/?rev=1344&view=rev
Author: saga-games
Date: 2012-08-20 23:42:49 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
[Fix] IT compatibility: Note-off effect is not reset with portamento'ed notes anymore (fixed Off-Porta.it).
Modified Paths:
--------------
trunk/OpenMPT/soundlib/Snd_fx.cpp
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2012-08-20 13:24:10 UTC (rev 1343)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2012-08-20 23:42:49 UTC (rev 1344)
@@ -16,12 +16,9 @@
#include "stdafx.h"
#include "sndfile.h"
-// -> CODE#0022
-// -> DESC="alternative BPM/Speed interpretation method"
-#include "../mptrack/mptrack.h"
+#ifdef MODPLUG_TRACKER
#include "../mptrack/moddoc.h"
-#include "../common/misc_util.h"
-// -! NEW_FEATURE#0022
+#endif // MODPLUG_TRACKER
#include "tuning.h"
#pragma warning(disable:4244)
@@ -750,7 +747,7 @@
}
// Default sample panning
- if((pSmp->uFlags & CHN_PANNING) || (GetType() & MOD_TYPE_XM))
+ if(pSmp->uFlags[CHN_PANNING] || (GetType() & MOD_TYPE_XM))
{
pChn->nPan = pSmp->nPan;
// IT compatibility: Sample and instrument panning overrides channel surround status.
@@ -766,10 +763,10 @@
// Reset envelopes
if (bResetEnv)
{
- if (!bPorta || !(GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)) || m_SongFlags[SONG_ITCOMPATGXX]
- || !pChn->nLength || (pChn->dwFlags[CHN_NOTEFADE] && !pChn->nFadeOutVol)
- // IT compatibility tentative fix: Reset envelopes when instrument changes.
- || (IsCompatibleMode(TRK_IMPULSETRACKER) && instrumentChanged))
+ if(!bPorta || !(GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)) || m_SongFlags[SONG_ITCOMPATGXX]
+ || !pChn->nLength || (pChn->dwFlags[CHN_NOTEFADE] && !pChn->nFadeOutVol)
+ // IT compatibility tentative fix: Reset envelopes when instrument changes.
+ || (IsCompatibleMode(TRK_IMPULSETRACKER) && instrumentChanged))
{
pChn->dwFlags.set(CHN_FASTVOLRAMP);
@@ -1110,7 +1107,12 @@
}
}
- pChn->dwFlags.reset(CHN_EXTRALOUD | CHN_KEYOFF);
+ // IT compatibility: Don't reset key-off flag on porta notes
+ // Test case: Off-Porta.it
+ if(IsCompatibleMode(TRK_IMPULSETRACKER) && bPorta)
+ pChn->dwFlags.reset(CHN_EXTRALOUD);
+ else
+ pChn->dwFlags.reset(CHN_EXTRALOUD | CHN_KEYOFF);
// Enable Ramping
if (!bPorta)
@@ -1225,7 +1227,7 @@
// Special case for MPT
if (bManual) pChn->dwFlags.reset(CHN_MUTE);
if((pChn->dwFlags[CHN_MUTE] && (gdwSoundSetup & SNDMIX_MUTECHNMODE))
- || (pChn->pModSample != nullptr && (pChn->pModSample->uFlags & CHN_MUTE) && !bManual)
+ || (pChn->pModSample != nullptr && pChn->pModSample->uFlags[CHN_MUTE] && !bManual)
|| (pChn->pModInstrument != nullptr && pChn->pModInstrument->dwFlags[INS_MUTE] && !bManual))
{
if (!bManual) pChn->nPeriod = 0;
@@ -1374,7 +1376,9 @@
//switch off duplicated note played on this plugin
IMixPlugin *pPlugin = m_MixPlugins[pIns->nMixPlug-1].pMixPlugin;
if(pPlugin && p->nNote != NOTE_NONE)
- pPlugin->MidiCommand(GetBestMidiChannel(i), p->pModInstrument->nMidiProgram, p->pModInstrument->wMidiBank, p->nNote + NOTE_KEYOFF, 0, i);
+ {
+ pPlugin->MidiCommand(GetBestMidiChannel(i), p->pModInstrument->nMidiProgram, p->pModInstrument->wMidiBank, p->nLastNote + NOTE_MAX_SPECIAL, 0, i);
+ }
break;
}
}
@@ -1525,7 +1529,7 @@
const PlugParamIndex plugparam = ModCommand::GetValueVolCol(pChn->rowCommand.volcmd, pChn->rowCommand.vol);
const PlugParamValue value = ModCommand::GetValueEffectCol(pChn->rowCommand.command, pChn->rowCommand.param) / PlugParamValue(ModCommand::maxColumnValue);
- if(plug > 0 && plug <= MAX_MIXPLUGINS && m_MixPlugins[plug-1].pMixPlugin)
+ if(plug > 0 && plug <= MAX_MIXPLUGINS && m_MixPlugins[plug - 1].pMixPlugin)
m_MixPlugins[plug-1].pMixPlugin->SetParameter(plugparam, value);
}
@@ -3485,7 +3489,7 @@
// we obviously also need a sample for this
ModSample *pModSample = pChn->pModSample;
- if(pModSample == nullptr || pModSample->pSample == nullptr || !(pModSample->uFlags & CHN_LOOP) || (pModSample->uFlags & CHN_16BIT)) return;
+ if(pModSample == nullptr || pModSample->pSample == nullptr || !pModSample->uFlags[CHN_LOOP] || pModSample->uFlags[CHN_16BIT]) return;
pChn->nEFxDelay += ModEFxTable[pChn->nEFxSpeed & 0x0F];
if((pChn->nEFxDelay & 0x80) == 0) return; // only applied if the "delay" reaches 128
@@ -4173,9 +4177,9 @@
if (pChn->dwFlags[CHN_SUSTAINLOOP] && pChn->pModSample && bKeyOn)
{
const ModSample *pSmp = pChn->pModSample;
- if(pSmp->uFlags & CHN_LOOP)
+ if(pSmp->uFlags[CHN_LOOP])
{
- if (pSmp->uFlags & CHN_PINGPONGLOOP)
+ if (pSmp->uFlags[CHN_PINGPONGLOOP])
pChn->dwFlags.set(CHN_PINGPONGLOOP);
else
pChn->dwFlags.reset(CHN_PINGPONGLOOP | CHN_PINGPONGFLAG);
@@ -4207,7 +4211,7 @@
if (pIns->VolEnv.nReleaseNode != ENV_RELEASE_NODE_UNSET)
{
- pChn->VolEnv.nEnvValueAtReleaseJump = Util::Round<LONG>(pIns->VolEnv.GetValueFromPosition(pChn->VolEnv.nEnvPosition) * 256.0f);
+ pChn->VolEnv.nEnvValueAtReleaseJump = Util::Round<int32>(pIns->VolEnv.GetValueFromPosition(pChn->VolEnv.nEnvPosition) * 256.0f);
pChn->VolEnv.nEnvPosition = pIns->VolEnv.Ticks[pIns->VolEnv.nReleaseNode];
}
@@ -4304,7 +4308,7 @@
if(!IsCompatibleMode(TRK_IMPULSETRACKER | TRK_FASTTRACKER2 | TRK_PROTRACKER | TRK_SCREAMTRACKER))
{
ModChannel *p = Chn;
- for (CHANNELINDEX i = 0; i < GetNumChannels(); i++, p++) if (p != pChn)
+ for(CHANNELINDEX i = 0; i < GetNumChannels(); i++, p++) if (p != pChn)
{
// Loop already done
if (p->nPatternLoopCount) return ROWINDEX_INVALID;
@@ -4610,7 +4614,7 @@
PLUGINDEX plug = 0;
if(Chn[nChn].pModInstrument != nullptr)
{
- if (respectMutes == RespectMutes && Chn[nChn].pModSample && (Chn[nChn].pModSample->uFlags & CHN_MUTE))
+ if (respectMutes == RespectMutes && Chn[nChn].pModSample && Chn[nChn].pModSample->uFlags[CHN_MUTE])
{
plug = 0;
} else
@@ -4691,6 +4695,7 @@
}
// Channel mutes
+#ifdef MODPLUG_TRACKER
for (CHANNELINDEX chan = 0; chan < GetNumChannels(); chan++)
{
if (m_bChannelMuteTogglePending[chan])
@@ -4702,6 +4707,7 @@
m_bChannelMuteTogglePending[chan] = false;
}
}
+#endif // MODPLUG_TRACKER
m_bPatternTransitionOccurred = false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
