Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1247] trunk/OpenMPT
|
From: <sag...@us...> - 2012-04-13 22:44:24
|
Revision: 1247
http://modplug.svn.sourceforge.net/modplug/?rev=1247&view=rev
Author: saga-games
Date: 2012-04-13 22:44:17 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
[Ref] Got rid of some (new) warnings
Modified Paths:
--------------
trunk/OpenMPT/mptrack/View_ins.cpp
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/mptrack/Vstplug.h
trunk/OpenMPT/soundlib/plugins/PlugInterface.h
Modified: trunk/OpenMPT/mptrack/View_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_ins.cpp 2012-04-13 20:46:38 UTC (rev 1246)
+++ trunk/OpenMPT/mptrack/View_ins.cpp 2012-04-13 22:44:17 UTC (rev 1247)
@@ -2160,8 +2160,8 @@
const BYTE nNote = midiByte1 + 1; // +1 is for MPT, where middle C is 61
int nVol = midiByte2;
- BYTE event = MIDIEvents::GetTypeFromEvent(dwMidiData);
- if ((event == 0x9) && !nVol) event = 0x8; //Convert event to note-off if req'd
+ MIDIEvents::EventType event = MIDIEvents::GetTypeFromEvent(dwMidiData);
+ if((event == MIDIEvents::evNoteOn) && !nVol) event = MIDIEvents::evNoteOff; //Convert event to note-off if req'd
BYTE mappedIndex = 0, paramValue = 0;
uint32 paramIndex = 0;
Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp 2012-04-13 20:46:38 UTC (rev 1246)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp 2012-04-13 22:44:17 UTC (rev 1247)
@@ -2279,7 +2279,7 @@
Resume();
}
- for(int mc = 0; mc < 16; mc++) //all midi chans
+ for(uint8 mc = 0; mc < 16; mc++) //all midi chans
{
VSTInstrChannel &channel = m_MidiCh[mc];
@@ -2288,13 +2288,13 @@
MidiSend(MIDIEvents::BuildCCEvent(MIDIEvents::MIDICC_AllNotesOff, mc, 0)); // all notes off
MidiSend(MIDIEvents::BuildCCEvent(MIDIEvents::MIDICC_AllSoundOff, mc, 0)); // all sounds off
- for (size_t i = 0; i < CountOf(channel.uNoteOnMap); i++) //all notes
+ for(size_t i = 0; i < CountOf(channel.uNoteOnMap); i++) //all notes
{
- for (CHANNELINDEX c = 0; c < CountOf(channel.uNoteOnMap[i]); c++)
+ for(CHANNELINDEX c = 0; c < CountOf(channel.uNoteOnMap[i]); c++)
{
while(channel.uNoteOnMap[i][c])
{
- MidiSend(MIDIEvents::BuildNoteOffEvent(mc, i, 0));
+ MidiSend(MIDIEvents::BuildNoteOffEvent(mc, static_cast<uint8>(i), 0));
channel.uNoteOnMap[i][c]--;
}
}
@@ -2314,23 +2314,23 @@
}
//end rewbs.VSTiNoteHoldonStopFix
-void CVstPlugin::MidiCC(UINT nMidiCh, UINT nController, UINT nParam, UINT /*trackChannel*/)
-//------------------------------------------------------------------------------------------
+void CVstPlugin::MidiCC(uint8 nMidiCh, MIDIEvents::MidiCC nController, uint8 nParam, CHANNELINDEX /*trackChannel*/)
+//-----------------------------------------------------------------------------------------------------------------
{
//Error checking
- LimitMax(nController, 127u);
- LimitMax(nParam, 127u);
+ LimitMax(nController, MIDIEvents::MIDICC_end);
+ LimitMax(nParam, uint8(127));
if(m_pSndFile && m_pSndFile->GetModFlag(MSF_MIDICC_BUGEMULATION))
- MidiSend(MIDIEvents::BuildEvent(MIDIEvents::evControllerChange, nMidiCh, nParam, nController)); // param and controller are swapped (old broken implementation)
+ MidiSend(MIDIEvents::BuildEvent(MIDIEvents::evControllerChange, nMidiCh, nParam, static_cast<uint8>(nController))); // param and controller are swapped (old broken implementation)
else
- MidiSend(MIDIEvents::BuildCCEvent(static_cast<MIDIEvents::MidiCC>(nController), nMidiCh, nParam));
+ MidiSend(MIDIEvents::BuildCCEvent(nController, nMidiCh, nParam));
}
// Bend midi pitch for given midi channel using tracker param (0x00-0xFF)
-void CVstPlugin::MidiPitchBend(UINT nMidiCh, int nParam, UINT /*trackChannel*/)
-//-----------------------------------------------------------------------------
+void CVstPlugin::MidiPitchBend(uint8 nMidiCh, int nParam, CHANNELINDEX /*trackChannel*/)
+//--------------------------------------------------------------------------------------
{
const int16 increment = static_cast<int16>(nParam * 0x2000 / 0xFF);
int16 newPitchBendPos = m_nMidiPitchBendPos[nMidiCh] + increment;
@@ -2340,8 +2340,8 @@
}
//Set midi pitch for given midi channel using uncoverted midi value (0-16383)
-void CVstPlugin::MidiPitchBend(UINT nMidiCh, short newPitchBendPos)
-//-----------------------------------------------------------------
+void CVstPlugin::MidiPitchBend(uint8 nMidiCh, int16 newPitchBendPos)
+//------------------------------------------------------------------
{
ASSERT(MIDIEvents::pitchBendMin <= newPitchBendPos && newPitchBendPos <= MIDIEvents::pitchBendMax);
m_nMidiPitchBendPos[nMidiCh] = newPitchBendPos;
@@ -2350,21 +2350,21 @@
//rewbs.introVST - many changes to MidiCommand, still to be refined.
-void CVstPlugin::MidiCommand(UINT nMidiCh, UINT nMidiProg, WORD wMidiBank, UINT note, UINT vol, UINT trackChannel)
-//----------------------------------------------------------------------------------------------------------------
+void CVstPlugin::MidiCommand(uint8 nMidiCh, uint8 nMidiProg, uint16 wMidiBank, uint16 note, uint16 vol, CHANNELINDEX trackChannel)
+//--------------------------------------------------------------------------------------------------------------------------------
{
VSTInstrChannel &channel = m_MidiCh[nMidiCh];
bool bankChanged = (channel.wMidiBank != --wMidiBank) && (wMidiBank < 0x4000);
bool progChanged = (channel.nProgram != --nMidiProg) && (nMidiProg < 0x80);
//get vol in [0,128[
- vol = min(vol / 2, 127);
+ uint8 volume = static_cast<uint8>(Util::Min(vol / 2, 127));
// Bank change
if(wMidiBank < 0x4000 && bankChanged)
{
- uint8 high = (wMidiBank >> 7);
- uint8 low = (wMidiBank & 0x7F);
+ uint8 high = static_cast<uint8>(wMidiBank >> 7);
+ uint8 low = static_cast<uint8>(wMidiBank & 0x7F);
if((channel.wMidiBank >> 7) != high)
{
@@ -2393,7 +2393,7 @@
if (note > NOTE_KEYOFF) //rewbs.vstiLive
{
note--;
- UINT i = note - NOTE_KEYOFF;
+ uint8 i = static_cast<uint8>(note - NOTE_KEYOFF);
if(channel.uNoteOnMap[i][trackChannel])
{
channel.uNoteOnMap[i][trackChannel]--;
@@ -2413,7 +2413,7 @@
for(uint8 i = 0; i < 128; i++)
{
channel.uNoteOnMap[i][trackChannel] = 0;
- MidiSend(MIDIEvents::BuildNoteOffEvent(nMidiCh, i, vol));
+ MidiSend(MIDIEvents::BuildNoteOffEvent(nMidiCh, i, volume));
}
}
@@ -2427,7 +2427,7 @@
// Some VSTis need a note off for each instance of a note on, e.g. fabfilter.
while(channel.uNoteOnMap[i][trackChannel])
{
- if(MidiSend(MIDIEvents::BuildNoteOffEvent(nMidiCh, i, vol)))
+ if(MidiSend(MIDIEvents::BuildNoteOffEvent(nMidiCh, i, volume)))
{
channel.uNoteOnMap[i][trackChannel]--;
} else
@@ -2441,7 +2441,7 @@
}
// Note On
- else if(ModCommand::IsNote(note))
+ else if(ModCommand::IsNote(static_cast<ModCommand::NOTE>(note)))
{
note -= NOTE_MIN;
@@ -2459,7 +2459,7 @@
if(channel.uNoteOnMap[note][trackChannel] < 17)
channel.uNoteOnMap[note][trackChannel]++;
- MidiSend(MIDIEvents::BuildNoteOnEvent(nMidiCh, note, vol));
+ MidiSend(MIDIEvents::BuildNoteOnEvent(nMidiCh, static_cast<uint8>(note), volume));
}
m_nPreviousMidiChan = nMidiCh;
Modified: trunk/OpenMPT/mptrack/Vstplug.h
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.h 2012-04-13 20:46:38 UTC (rev 1246)
+++ trunk/OpenMPT/mptrack/Vstplug.h 2012-04-13 22:44:17 UTC (rev 1247)
@@ -191,9 +191,9 @@
void Process(float *pOutL, float *pOutR, size_t nSamples);
void Init(unsigned long nFreq, int bReset);
bool MidiSend(DWORD dwMidiCode);
- void MidiCC(UINT nMidiCh, UINT nController, UINT nParam, UINT trackChannel);
- void MidiPitchBend(UINT nMidiCh, int nParam, UINT trackChannel);
- void MidiCommand(UINT nMidiCh, UINT nMidiProg, WORD wMidiBank, UINT note, UINT vol, UINT trackChan);
+ void MidiCC(uint8 nMidiCh, MIDIEvents::MidiCC nController, uint8 nParam, CHANNELINDEX trackChannel);
+ void MidiPitchBend(uint8 nMidiCh, int nParam, CHANNELINDEX trackChannel);
+ void MidiCommand(uint8 nMidiCh, uint8 nMidiProg, uint16 wMidiBank, uint16 note, uint16 vol, CHANNELINDEX trackChannel);
void HardAllNotesOff(); //rewbs.VSTiNoteHoldonStopFix
bool isPlaying(UINT note, UINT midiChn, UINT trackerChn); //rewbs.instroVST
bool MoveNote(UINT note, UINT midiChn, UINT sourceTrackerChn, UINT destTrackerChn); //rewbs.instroVST
@@ -217,7 +217,7 @@
VstSpeakerArrangement speakerArrangement; //rewbs.VSTcompliance
private:
- void MidiPitchBend(UINT nMidiCh, short pitchBendPos);
+ void MidiPitchBend(uint8 nMidiCh, int16 pitchBendPos);
bool GetProgramNameIndexed(VstInt32 index, VstIntPtr category, char *text); //rewbs.VSTpresets
Modified: trunk/OpenMPT/soundlib/plugins/PlugInterface.h
===================================================================
--- trunk/OpenMPT/soundlib/plugins/PlugInterface.h 2012-04-13 20:46:38 UTC (rev 1246)
+++ trunk/OpenMPT/soundlib/plugins/PlugInterface.h 2012-04-13 22:44:17 UTC (rev 1247)
@@ -21,6 +21,7 @@
#include "Snd_defs.h"
#include "../common/misc_util.h"
+#include "../soundlib/MIDIEvents.h"
////////////////////////////////////////////////////////////////////
// Mix Plugins
@@ -40,9 +41,9 @@
virtual void Process(float *pOutL, float *pOutR, size_t nSamples) = 0;
virtual void Init(unsigned long nFreq, int bReset) = 0;
virtual bool MidiSend(DWORD dwMidiCode) = 0;
- virtual void MidiCC(UINT nMidiCh, UINT nController, UINT nParam, UINT trackChannel) = 0;
- virtual void MidiPitchBend(UINT nMidiCh, int nParam, UINT trackChannel) = 0;
- virtual void MidiCommand(UINT nMidiCh, UINT nMidiProg, WORD wMidiBank, UINT note, UINT vol, UINT trackChan) = 0;
+ virtual void MidiCC(uint8 nMidiCh, MIDIEvents::MidiCC nController, uint8 nParam, CHANNELINDEX trackChannel) = 0;
+ virtual void MidiPitchBend(uint8 nMidiCh, int nParam, CHANNELINDEX trackChannel) = 0;
+ virtual void MidiCommand(uint8 nMidiCh, uint8 nMidiProg, uint16 wMidiBank, uint16 note, uint16 vol, CHANNELINDEX trackChannel) = 0;
virtual void HardAllNotesOff() = 0; //rewbs.VSTCompliance
virtual void RecalculateGain() = 0;
virtual bool isPlaying(UINT note, UINT midiChn, UINT trackerChn) = 0; //rewbs.VSTiNNA
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
