Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4910] trunk/OpenMPT
|
From: <sag...@us...> - 2015-03-29 01:18:23
|
Revision: 4910
http://sourceforge.net/p/modplug/code/4910
Author: saga-games
Date: 2015-03-29 01:18:09 +0000 (Sun, 29 Mar 2015)
Log Message:
-----------
[Fix] Seeking code could be influenced by PC events.
[Ref] We really don't need size_t for macro lengths.
[Ref] Rename panning bitness enums to be more self-explanatory.
[Mod] OpenMPT: Version is now 1.24.02.08
Modified Paths:
--------------
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Sndfile.h
Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h 2015-03-28 22:23:27 UTC (rev 4909)
+++ trunk/OpenMPT/common/versionNumber.h 2015-03-29 01:18:09 UTC (rev 4910)
@@ -19,7 +19,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 24
#define VER_MINOR 02
-#define VER_MINORMINOR 07
+#define VER_MINORMINOR 08
//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-03-28 22:23:27 UTC (rev 4909)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2015-03-29 01:18:09 UTC (rev 4910)
@@ -397,6 +397,11 @@
{
if(IsCompatibleMode(TRK_SCREAMTRACKER) && ChnSettings[nChn].dwFlags[CHN_MUTE]) // not even effects are processed on muted S3M channels
continue;
+ if(p->IsPcNote())
+ {
+ pChn[nChn].rowCommand.Clear();
+ continue;
+ }
pChn[nChn].rowCommand = *p;
switch(p->command)
{
@@ -700,19 +705,19 @@
}
break;
case CMD_PANNING8:
- Panning(pChn, param, _8bit);
+ Panning(pChn, param, Pan8bit);
break;
case CMD_MODCMDEX:
case CMD_S3MCMDEX:
if((param & 0xF0) == 0x80)
{
- Panning(pChn, (param & 0x0F), _4bit);
+ Panning(pChn, (param & 0x0F), Pan4bit);
}
break;
}
if(pChn->rowCommand.volcmd == VOLCMD_PANNING)
{
- Panning(pChn, pChn->rowCommand.vol, _6bit);
+ Panning(pChn, pChn->rowCommand.vol, Pan6bit);
}
}
@@ -2850,7 +2855,7 @@
{
break;
}
- Panning(pChn, param, _8bit);
+ Panning(pChn, param, Pan8bit);
break;
// Panning Slide
@@ -3658,11 +3663,11 @@
{
pChn->dwFlags.reset(CHN_SURROUND);
}
- if(panBits == _4bit)
+ if(panBits == Pan4bit)
{
// 0...15 panning
pChn->nPan = (param * 256 + 8) / 15;
- } else if(panBits == _6bit)
+ } else if(panBits == Pan6bit)
{
// 0...64 panning
if(param > 64) param = 64;
@@ -3984,7 +3989,7 @@
case 0x80:
if(m_SongFlags[SONG_FIRSTTICK] && !m_SongFlags[SONG_PT1XMODE])
{
- Panning(pChn, param, _4bit);
+ Panning(pChn, param, Pan4bit);
}
break;
// E9x: Retrig
@@ -4138,7 +4143,7 @@
case 0x80:
if(m_SongFlags[SONG_FIRSTTICK])
{
- Panning(pChn, param, _4bit);
+ Panning(pChn, param, Pan4bit);
}
break;
// S9x: Sound Control
@@ -4272,18 +4277,18 @@
// [in] macro: Actual MIDI Macro string
// [in] param: Parameter for parametric macros (Z00 - Z7F)
// [in] plugin: Plugin to send MIDI message to (if not specified but needed, it is autodetected)
-void CSoundFile::ProcessMIDIMacro(CHANNELINDEX nChn, bool isSmooth, char *macro, uint8 param, PLUGINDEX plugin)
-//-------------------------------------------------------------------------------------------------------------
+void CSoundFile::ProcessMIDIMacro(CHANNELINDEX nChn, bool isSmooth, const char *macro, uint8 param, PLUGINDEX plugin)
+//-------------------------------------------------------------------------------------------------------------------
{
- ModChannel *pChn = &m_PlayState.Chn[nChn];
- const ModInstrument *pIns = GetNumInstruments() ? pChn->pModInstrument : nullptr;
+ ModChannel &chn = m_PlayState.Chn[nChn];
+ const ModInstrument *pIns = GetNumInstruments() ? chn.pModInstrument : nullptr;
unsigned char out[MACRO_LENGTH];
- size_t outPos = 0; // output buffer position, which also equals the number of complete bytes
- const uint8 lastZxxParam = pChn->lastZxxParam;
+ uint32 outPos = 0; // output buffer position, which also equals the number of complete bytes
+ const uint8 lastZxxParam = chn.lastZxxParam;
bool firstNibble = true;
- for(size_t pos = 0; pos < (MACRO_LENGTH - 1) && macro[pos]; pos++)
+ for(uint32 pos = 0; pos < (MACRO_LENGTH - 1) && macro[pos]; pos++)
{
bool isNibble = false; // did we parse a nibble or a byte value?
unsigned char data = 0; // data that has just been parsed
@@ -4304,29 +4309,29 @@
data = (unsigned char)GetBestMidiChannel(nChn);
} else if(macro[pos] == 'n') // n: note value (last triggered note)
{
- if(ModCommand::IsNote(pChn->nLastNote))
+ if(ModCommand::IsNote(chn.nLastNote))
{
- data = (unsigned char)(pChn->nLastNote - NOTE_MIN);
+ data = (unsigned char)(chn.nLastNote - NOTE_MIN);
}
} else if(macro[pos] == 'v') // v: velocity
{
// This is "almost" how IT does it - apparently, IT seems to lag one row behind on global volume or channel volume changes.
- const int swing = (IsCompatibleMode(TRK_IMPULSETRACKER) || GetModFlag(MSF_OLDVOLSWING)) ? pChn->nVolSwing : 0;
- const int vol = Util::muldiv((pChn->nVolume + swing) * m_PlayState.m_nGlobalVolume, pChn->nGlobalVol * pChn->nInsVol, 1 << 20);
+ const int swing = (IsCompatibleMode(TRK_IMPULSETRACKER) || GetModFlag(MSF_OLDVOLSWING)) ? chn.nVolSwing : 0;
+ const int vol = Util::muldiv((chn.nVolume + swing) * m_PlayState.m_nGlobalVolume, chn.nGlobalVol * chn.nInsVol, 1 << 20);
data = (unsigned char)Clamp(vol / 2, 1, 127);
- //data = (unsigned char)MIN((pChn->nVolume * pChn->nGlobalVol * m_nGlobalVolume) >> (1 + 6 + 8), 127);
+ //data = (unsigned char)MIN((chn.nVolume * chn.nGlobalVol * m_nGlobalVolume) >> (1 + 6 + 8), 127);
} else if(macro[pos] == 'u') // u: volume (calculated)
{
// Same note as with velocity applies here, but apparently also for instrument / sample volumes?
- const int vol = Util::muldiv(pChn->nCalcVolume * m_PlayState.m_nGlobalVolume, pChn->nGlobalVol * pChn->nInsVol, 1 << 26);
+ const int vol = Util::muldiv(chn.nCalcVolume * m_PlayState.m_nGlobalVolume, chn.nGlobalVol * chn.nInsVol, 1 << 26);
data = (unsigned char)Clamp(vol / 2, 1, 127);
- //data = (unsigned char)MIN((pChn->nCalcVolume * pChn->nGlobalVol * m_nGlobalVolume) >> (7 + 6 + 8), 127);
+ //data = (unsigned char)MIN((chn.nCalcVolume * chn.nGlobalVol * m_nGlobalVolume) >> (7 + 6 + 8), 127);
} else if(macro[pos] == 'x') // x: pan set
{
- data = (unsigned char)std::min(pChn->nPan / 2, 127);
+ data = (unsigned char)std::min(chn.nPan / 2, 127);
} else if(macro[pos] == 'y') // y: calculated pan
{
- data = (unsigned char)std::min(pChn->nRealPan / 2, 127);
+ data = (unsigned char)std::min(chn.nRealPan / 2, 127);
} else if(macro[pos] == 'a') // a: high byte of bank select
{
if(pIns && pIns->wMidiBank)
@@ -4348,14 +4353,14 @@
} else if(macro[pos] == 'z') // z: macro data
{
data = param & 0x7F;
- if(isSmooth && pChn->lastZxxParam < 0x80
+ if(isSmooth && chn.lastZxxParam < 0x80
&& (outPos < 3 || out[outPos - 3] != 0xF0 || out[outPos - 2] < 0xF0))
{
// Interpolation for external MIDI messages - interpolation for internal messages
// is handled separately to allow for more than 7-bit granularity where it's possible
data = (uint8)CalculateSmoothParamChange((float)lastZxxParam, (float)data);
}
- pChn->lastZxxParam = data;
+ chn.lastZxxParam = data;
} else // unrecognized byte (e.g. space char)
{
continue;
@@ -4396,10 +4401,10 @@
}
// Macro string has been parsed and translated, now send the message(s)...
- size_t sendPos = 0;
+ uint32 sendPos = 0;
while(sendPos < outPos)
{
- size_t sendLen = 0;
+ uint32 sendLen = 0;
if(out[sendPos] == 0xF0)
{
// SysEx start
@@ -4410,7 +4415,7 @@
} else
{
// SysEx message, find end of message
- for(size_t i = sendPos + 1; i < outPos; i++)
+ for(uint32 i = sendPos + 1; i < outPos; i++)
{
if(out[i] == 0xF7)
{
@@ -4444,7 +4449,7 @@
break;
}
- size_t bytesSent = SendMIDIData(nChn, isSmooth, out + sendPos, sendLen, plugin);
+ uint32 bytesSent = SendMIDIData(nChn, isSmooth, out + sendPos, sendLen, plugin);
// Ideally (if there's no error in the macro data), we should have sendLen == bytesSent.
if(bytesSent > 0)
{
@@ -4453,9 +4458,7 @@
{
sendPos += sendLen;
}
-
}
-
}
@@ -4479,7 +4482,7 @@
// Process MIDI macro data parsed by ProcessMIDIMacro... return bytes sent on success, 0 on (parse) failure.
-size_t CSoundFile::SendMIDIData(CHANNELINDEX nChn, bool isSmooth, const unsigned char *macro, size_t macroLen, PLUGINDEX plugin)
+uint32 CSoundFile::SendMIDIData(CHANNELINDEX nChn, bool isSmooth, const unsigned char *macro, uint32 macroLen, PLUGINDEX plugin)
//------------------------------------------------------------------------------------------------------------------------------
{
if(macroLen < 1)
@@ -4620,10 +4623,10 @@
pPlugin->MidiSysexSend(reinterpret_cast<const char *>(macro), macroLen);
} else
{
- for(size_t pos = 0; pos < macroLen; pos += 3)
+ for(uint32 pos = 0; pos < macroLen; pos += 3)
{
uint32 curData = 0;
- memcpy(&curData, macro + pos, std::min<size_t>(3, macroLen - pos));
+ memcpy(&curData, macro + pos, std::min<uint32>(3, macroLen - pos));
pPlugin->MidiSend(curData);
}
}
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2015-03-28 22:23:27 UTC (rev 4909)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2015-03-29 01:18:09 UTC (rev 4910)
@@ -824,9 +824,9 @@
// Type of panning command
enum PanningType
{
- _4bit = 4,
- _6bit = 6,
- _8bit = 8,
+ Pan4bit = 4,
+ Pan6bit = 6,
+ Pan8bit = 8,
};
// Channel Effects
void UpdateS3MEffectMemory(ModChannel *pChn, ModCommand::PARAM param) const;
@@ -861,16 +861,16 @@
void GlobalVolSlide(ModCommand::PARAM param, uint8 &nOldGlobalVolSlide);
void ProcessMacroOnChannel(CHANNELINDEX nChn);
- void ProcessMIDIMacro(CHANNELINDEX nChn, bool isSmooth, char *macro, uint8 param = 0, PLUGINDEX plugin = 0);
+ void ProcessMIDIMacro(CHANNELINDEX nChn, bool isSmooth, const char *macro, uint8 param = 0, PLUGINDEX plugin = 0);
float CalculateSmoothParamChange(float currentValue, float param) const;
- size_t SendMIDIData(CHANNELINDEX nChn, bool isSmooth, const unsigned char *macro, size_t macroLen, PLUGINDEX plugin);
+ uint32 SendMIDIData(CHANNELINDEX nChn, bool isSmooth, const unsigned char *macro, uint32 macroLen, PLUGINDEX plugin);
void SetupChannelFilter(ModChannel *pChn, bool bReset, int flt_modifier = 256) const;
// Low-Level effect processing
void DoFreqSlide(ModChannel *pChn, LONG nFreqSlide) const;
void UpdateTimeSignature();
- UINT GetNumTicksOnCurrentRow() const
+ uint32 GetNumTicksOnCurrentRow() const
{
return (m_PlayState.m_nMusicSpeed + m_PlayState.m_nFrameDelay) * MAX(m_PlayState.m_nPatternDelay, 1);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
