Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1357] trunk/OpenMPT
|
From: <sag...@us...> - 2012-09-21 21:10:46
|
Revision: 1357
http://modplug.svn.sourceforge.net/modplug/?rev=1357&view=rev
Author: saga-games
Date: 2012-09-21 21:10:38 +0000 (Fri, 21 Sep 2012)
Log Message:
-----------
[Ref] Some oneliner refactorings.
Modified Paths:
--------------
trunk/OpenMPT/common/Reporting.cpp
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/CommandSet.h
trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp
trunk/OpenMPT/mptrack/Stdafx.h
trunk/OpenMPT/mptrack/View_ins.cpp
trunk/OpenMPT/mptrack/View_pat.cpp
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/mptrack/test/test.cpp
trunk/OpenMPT/soundlib/MIDIEvents.cpp
trunk/OpenMPT/soundlib/MIDIEvents.h
trunk/OpenMPT/soundlib/ModSample.cpp
Modified: trunk/OpenMPT/common/Reporting.cpp
===================================================================
--- trunk/OpenMPT/common/Reporting.cpp 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/common/Reporting.cpp 2012-09-21 21:10:38 UTC (rev 1357)
@@ -10,12 +10,17 @@
#include "Stdafx.h"
#include "Reporting.h"
+#ifdef MODPLUG_TRACKER
#include "../mptrack/Mainfrm.h"
+#else
+#include <iostream>
+#endif // MODPLUG_TRACKER
UINT Reporting::ShowNotification(const char *text, const char *caption, UINT flags, const CWnd *parent)
//-----------------------------------------------------------------------------------------------------
{
+#ifdef MODPLUG_TRACKER
CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
if(pMainFrm != nullptr && pMainFrm->GetInputHandler() != nullptr)
@@ -35,6 +40,10 @@
}
return result;
+#else
+ std::cout << caption << std::endl << text << std::endl;
+ return 0;
+#endif // MODPLUG_TRACKER
}
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2012-09-21 21:10:38 UTC (rev 1357)
@@ -659,13 +659,7 @@
// Command Manipulation
//-------------------------------------------------------
-CString CCommandSet::Add(KeyCombination kc, CommandID cmd, bool overwrite)
-//------------------------------------------------------------------------
-{
- return Add(kc, cmd, overwrite, -1);
-}
-
CString CCommandSet::Add(KeyCombination kc, CommandID cmd, bool overwrite, int pos)
//---------------------------------------------------------------------------------
{
@@ -704,13 +698,15 @@
}
else
{
- if (crossContext) {
+ if (crossContext)
+ {
report += "Warning! the following commands may conflict:\r\n >" + GetCommandText((CommandID)curCmd) + " in " + GetContextText(curKc.ctx) + "\r\n >" + GetCommandText((CommandID)cmd) + " in " + GetContextText(kc.ctx) + "\r\n\r\n";
- Log("%s",report);
- } else {
+ Log("%s", report);
+ } else
+ {
Remove(curKc, (CommandID)curCmd);
report += "Removed due to conflict in same context:\r\n >" + GetCommandText((CommandID)curCmd) + " in " + GetContextText(curKc.ctx) + "\r\n\r\n";
- Log("%s",report);
+ Log("%s", report);
}
}
}
@@ -780,37 +776,35 @@
{
//World's biggest, most confusing method. :)
//Needs refactoring. Maybe make lots of Rule subclasses, each with their own Enforce() method?
- //bool removing = !adding; //for attempt to salvage readability..
KeyCombination curKc; // for looping through key combinations
KeyCombination newKc; // for adding new key combinations
CString report="";
- if (enforceRule[krAllowNavigationWithSelection])
+ if(enforceRule[krAllowNavigationWithSelection])
{
// When we get a new navigation command key, we need to
// make sure this navigation will work when any selection key is pressed
- if (inCmd>=kcStartPatNavigation && inCmd<=kcEndPatNavigation)
+ if(inCmd >= kcStartPatNavigation && inCmd <= kcEndPatNavigation)
{//Check that it is a nav cmd
CommandID cmdNavSelection = (CommandID)(kcStartPatNavigationSelect + (inCmd-kcStartPatNavigation));
- for (int kSel=0; kSel<commands[kcSelect].kcList.GetSize(); kSel++)
+ for(int kSel=0; kSel<commands[kcSelect].kcList.GetSize(); kSel++)
{//for all selection modifiers
curKc=commands[kcSelect].kcList[kSel];
newKc=inKc;
newKc.mod|=curKc.mod; //Add selection modifier's modifiers to this command
- if (adding)
+ if(adding)
{
Log("Enforcing rule krAllowNavigationWithSelection - adding key:%d with modifier:%d to command: %d\n", kSel, newKc.mod, cmdNavSelection);
Add(newKc, cmdNavSelection, false);
- }
- else
- {
+ } else
+ {
Log("Enforcing rule krAllowNavigationWithSelection - removing key:%d with modifier:%d to command: %d\n", kSel, newKc.mod, cmdNavSelection);
Remove(newKc, cmdNavSelection);
}
}
}
// Same applies for orderlist navigation
- else if (inCmd>=kcStartOrderlistNavigation && inCmd<=kcEndOrderlistNavigation)
+ else if(inCmd >= kcStartOrderlistNavigation && inCmd <= kcEndOrderlistNavigation)
{//Check that it is a nav cmd
CommandID cmdNavSelection = (CommandID)(kcStartOrderlistNavigationSelect+ (inCmd-kcStartOrderlistNavigation));
for (int kSel=0; kSel<commands[kcSelect].kcList.GetSize(); kSel++)
@@ -818,13 +812,12 @@
curKc=commands[kcSelect].kcList[kSel];
newKc=inKc;
newKc.mod|=curKc.mod; //Add selection modifier's modifiers to this command
- if (adding)
+ if(adding)
{
Log("Enforcing rule krAllowNavigationWithSelection - adding key:%d with modifier:%d to command: %d\n", kSel, newKc.mod, cmdNavSelection);
Add(newKc, cmdNavSelection, false);
- }
- else
- {
+ } else
+ {
Log("Enforcing rule krAllowNavigationWithSelection - removing key:%d with modifier:%d to command: %d\n", kSel, newKc.mod, cmdNavSelection);
Remove(newKc, cmdNavSelection);
}
@@ -832,44 +825,42 @@
}
// When we get a new selection key, we need to make sure that
// all navigation commands will work with this selection key pressed
- else if (inCmd==kcSelect)
+ else if(inCmd == kcSelect)
{
// check that is is a selection
- for (int curCmd=kcStartPatNavigation; curCmd<=kcEndPatNavigation; curCmd++)
+ for(int curCmd=kcStartPatNavigation; curCmd<=kcEndPatNavigation; curCmd++)
{
// for all nav commands
- for (int k=0; k<commands[curCmd].kcList.GetSize(); k++)
+ for(int k = 0; k < commands[curCmd].kcList.GetSize(); k++)
{
// for all keys for this command
CommandID cmdNavSelection = (CommandID)(kcStartPatNavigationSelect + (curCmd-kcStartPatNavigation));
newKc=commands[curCmd].kcList[k]; // get all properties from the current nav cmd key
newKc.mod|=inKc.mod; // and the new selection modifier
- if (adding)
+ if(adding)
{
Log("Enforcing rule krAllowNavigationWithSelection - adding key:%d with modifier:%d to command: %d\n", curCmd, inKc.mod, cmdNavSelection);
Add(newKc, cmdNavSelection, false);
- }
- else
- {
+ } else
+ {
Log("Enforcing rule krAllowNavigationWithSelection - removing key:%d with modifier:%d to command: %d\n", curCmd, inKc.mod, cmdNavSelection);
Remove(newKc, cmdNavSelection);
}
}
} // end all nav commands
- for (int curCmd=kcStartOrderlistNavigation; curCmd<=kcEndOrderlistNavigation; curCmd++)
+ for(int curCmd = kcStartOrderlistNavigation; curCmd <= kcEndOrderlistNavigation; curCmd++)
{// for all nav commands
- for (int k=0; k<commands[curCmd].kcList.GetSize(); k++)
+ for(int k = 0; k < commands[curCmd].kcList.GetSize(); k++)
{// for all keys for this command
CommandID cmdNavSelection = (CommandID)(kcStartOrderlistNavigationSelect+ (curCmd-kcStartOrderlistNavigation));
newKc=commands[curCmd].kcList[k]; // get all properties from the current nav cmd key
newKc.mod|=inKc.mod; // and the new selection modifier
- if (adding)
+ if(adding)
{
Log("Enforcing rule krAllowNavigationWithSelection - adding key:%d with modifier:%d to command: %d\n", curCmd, inKc.mod, cmdNavSelection);
Add(newKc, cmdNavSelection, false);
- }
- else
- {
+ } else
+ {
Log("Enforcing rule krAllowNavigationWithSelection - removing key:%d with modifier:%d to command: %d\n", curCmd, inKc.mod, cmdNavSelection);
Remove(newKc, cmdNavSelection);
}
@@ -878,40 +869,42 @@
}
} // end krAllowNavigationWithSelection
- if (enforceRule[krAllowSelectionWithNavigation])
+ if(enforceRule[krAllowSelectionWithNavigation])
{
KeyCombination newKcSel;
// When we get a new navigation command key, we need to ensure
// all selection keys will work even when this new selection key is pressed
- if (inCmd>=kcStartPatNavigation && inCmd<=kcEndPatNavigation)
+ if(inCmd >= kcStartPatNavigation && inCmd <= kcEndPatNavigation)
{//if this is a navigation command
- for (int kSel=0; kSel<commands[kcSelect].kcList.GetSize(); kSel++)
+ for(int kSel = 0; kSel < commands[kcSelect].kcList.GetSize(); kSel++)
{//for all deselection modifiers
- newKcSel=commands[kcSelect].kcList[kSel]; // get all properties from the selection key
- newKcSel.mod|=inKc.mod; // add modifiers from the new nav command
- if (adding) {
+ newKcSel = commands[kcSelect].kcList[kSel]; // get all properties from the selection key
+ newKcSel.mod |= inKc.mod; // add modifiers from the new nav command
+ if(adding)
+ {
Log("Enforcing rule krAllowSelectionWithNavigation: adding removing kcSelectWithNav and kcSelectOffWithNav\n");
Add(newKcSel, kcSelectWithNav, false);
- }
- else {
+ } else
+ {
Log("Enforcing rule krAllowSelectionWithNavigation: removing kcSelectWithNav and kcSelectOffWithNav\n");
Remove(newKcSel, kcSelectWithNav);
}
}
}
// Same for orderlist navigation
- if (inCmd>=kcStartOrderlistNavigation&& inCmd<=kcEndOrderlistNavigation)
+ if(inCmd >= kcStartOrderlistNavigation && inCmd <= kcEndOrderlistNavigation)
{//if this is a navigation command
- for (int kSel=0; kSel<commands[kcSelect].kcList.GetSize(); kSel++)
+ for(int kSel = 0; kSel < commands[kcSelect].kcList.GetSize(); kSel++)
{//for all deselection modifiers
newKcSel=commands[kcSelect].kcList[kSel]; // get all properties from the selection key
newKcSel.mod|=inKc.mod; // add modifiers from the new nav command
- if (adding) {
+ if(adding)
+ {
Log("Enforcing rule krAllowSelectionWithNavigation: adding removing kcSelectWithNav and kcSelectOffWithNav\n");
Add(newKcSel, kcSelectWithNav, false);
- }
- else {
+ } else
+ {
Log("Enforcing rule krAllowSelectionWithNavigation: removing kcSelectWithNav and kcSelectOffWithNav\n");
Remove(newKcSel, kcSelectWithNav);
}
@@ -919,28 +912,29 @@
}
// When we get a new selection key, we need to ensure it will work even when
// any navigation key is pressed
- else if (inCmd==kcSelect)
+ else if(inCmd == kcSelect)
{
- for (int curCmd=kcStartPatNavigation; curCmd<=kcEndPatNavigation; curCmd++)
+ for(int curCmd = kcStartPatNavigation; curCmd <= kcEndPatNavigation; curCmd++)
{//for all nav commands
- for (int k=0; k<commands[curCmd].kcList.GetSize(); k++)
+ for(int k = 0; k < commands[curCmd].kcList.GetSize(); k++)
{// for all keys for this command
newKcSel=inKc; // get all properties from the selection key
newKcSel.mod|=commands[curCmd].kcList[k].mod; //add the nav keys' modifiers
- if (adding) {
+ if(adding)
+ {
Log("Enforcing rule krAllowSelectionWithNavigation - adding key:%d with modifier:%d to command: %d\n", curCmd, inKc.mod, kcSelectWithNav);
Add(newKcSel, kcSelectWithNav, false);
- }
- else {
+ } else
+ {
Log("Enforcing rule krAllowSelectionWithNavigation - removing key:%d with modifier:%d to command: %d\n", curCmd, inKc.mod, kcSelectWithNav);
Remove(newKcSel, kcSelectWithNav);
}
}
} // end all nav commands
- for (int curCmd=kcStartOrderlistNavigation; curCmd<=kcEndOrderlistNavigation; curCmd++)
+ for(int curCmd = kcStartOrderlistNavigation; curCmd <= kcEndOrderlistNavigation; curCmd++)
{//for all nav commands
- for (int k=0; k<commands[curCmd].kcList.GetSize(); k++)
+ for(int k = 0; k <commands[curCmd].kcList.GetSize(); k++)
{// for all keys for this command
newKcSel=inKc; // get all properties from the selection key
newKcSel.mod |= commands[curCmd].kcList[k].mod; //add the nav keys' modifiers
@@ -948,8 +942,7 @@
{
Log("Enforcing rule krAllowSelectionWithNavigation - adding key:%d with modifier:%d to command: %d\n", curCmd, inKc.mod, kcSelectWithNav);
Add(newKcSel, kcSelectWithNav, false);
- }
- else
+ } else
{
Log("Enforcing rule krAllowSelectionWithNavigation - removing key:%d with modifier:%d to command: %d\n", curCmd, inKc.mod, kcSelectWithNav);
Remove(newKcSel, kcSelectWithNav);
@@ -1002,7 +995,7 @@
if(enforceRule[krAllowSelectCopySelectCombos])
{
KeyCombination newKcSel, newKcCopySel;
- if (inCmd==kcSelect)
+ if(inCmd==kcSelect)
{
// On getting a new selection key, make this selection key work with all copy selects' modifiers
// On getting a new selection key, make all copyselects work with this key's modifiers
@@ -1013,35 +1006,33 @@
newKcCopySel=commands[kcCopySelect].kcList[k];
newKcCopySel.mod|=inKc.mod;
Log("Enforcing rule krAllowSelectCopySelectCombos\n");
- if (adding)
+ if(adding)
{
Add(newKcSel, kcSelectWithCopySelect, false);
Add(newKcCopySel, kcCopySelectWithSelect, false);
- }
- else
+ } else
{
Remove(newKcSel, kcSelectWithCopySelect);
Remove(newKcCopySel, kcCopySelectWithSelect);
}
}
}
- if (inCmd==kcCopySelect)
+ if(inCmd == kcCopySelect)
{
// On getting a new copyselection key, make this copyselection key work with all selects' modifiers
// On getting a new copyselection key, make all selects work with this key's modifiers
- for (int k=0; k<commands[kcSelect].kcList.GetSize(); k++)
+ for(int k = 0; k < commands[kcSelect].kcList.GetSize(); k++)
{
newKcSel=commands[kcSelect].kcList[k];
- newKcSel.mod|=inKc.mod;
+ newKcSel.mod |= inKc.mod;
newKcCopySel=inKc;
newKcCopySel.mod|=commands[kcSelect].kcList[k].mod;
Log("Enforcing rule krAllowSelectCopySelectCombos\n");
- if (adding)
+ if(adding)
{
Add(newKcSel, kcSelectWithCopySelect, false);
Add(newKcCopySel, kcCopySelectWithSelect, false);
- }
- else
+ } else
{
Remove(newKcSel, kcSelectWithCopySelect);
Remove(newKcCopySel, kcCopySelectWithSelect);
@@ -1757,56 +1748,28 @@
kc.code = VK_OEM_MINUS;
pCommands->Add(kc, kcOrderlistPatMinus, false);
- kc.code = '0';
- pCommands->Add(kc, kcOrderlistPat0, false);
- kc.code = VK_NUMPAD0;
- pCommands->Add(kc, kcOrderlistPat0, false);
+ STATIC_ASSERT(VK_NUMPAD0 + 9 == VK_NUMPAD9);
+ STATIC_ASSERT(kcOrderlistPat0 + 9 == kcOrderlistPat9);
+ for(int i = 0; i <= 9; i++)
+ {
+ kc.code = '0' + i;
+ pCommands->Add(kc, static_cast<CommandID>(kcOrderlistPat0 + i), false);
+ kc.code = VK_NUMPAD0 + i;
+ pCommands->Add(kc, static_cast<CommandID>(kcOrderlistPat0 + i), false);
+ }
- kc.code = '1';
- pCommands->Add(kc, kcOrderlistPat1, false);
- kc.code = VK_NUMPAD1;
- pCommands->Add(kc, kcOrderlistPat1, false);
+ kc.code = 'I';
+ pCommands->Add(kc, kcOrderlistPatIgnore, false);
- kc.code = '2';
- pCommands->Add(kc, kcOrderlistPat2, false);
- kc.code = VK_NUMPAD2;
- pCommands->Add(kc, kcOrderlistPat2, false);
+ kc.code = VK_SPACE;
+ pCommands->Add(kc, kcOrderlistPatInvalid, false);
- kc.code = '3';
- pCommands->Add(kc, kcOrderlistPat3, false);
- kc.code = VK_NUMPAD3;
- pCommands->Add(kc, kcOrderlistPat3, false);
+ kc.code = 'L';
+ kc.mod = HOTKEYF_CONTROL;
+ pCommands->Add(kc, kcOrderlistLockPlayback, false);
- kc.code = '4';
- pCommands->Add(kc, kcOrderlistPat4, false);
- kc.code = VK_NUMPAD4;
- pCommands->Add(kc, kcOrderlistPat4, false);
-
- kc.code = '5';
- pCommands->Add(kc, kcOrderlistPat5, false);
- kc.code = VK_NUMPAD5;
- pCommands->Add(kc, kcOrderlistPat5, false);
-
- kc.code = '6';
- pCommands->Add(kc, kcOrderlistPat6, false);
- kc.code = VK_NUMPAD6;
- pCommands->Add(kc, kcOrderlistPat6, false);
-
- kc.code = '7';
- pCommands->Add(kc, kcOrderlistPat7, false);
- kc.code = VK_NUMPAD7;
- pCommands->Add(kc, kcOrderlistPat7, false);
-
- kc.code = '8';
- pCommands->Add(kc, kcOrderlistPat8, false);
- kc.code = VK_NUMPAD8;
- pCommands->Add(kc, kcOrderlistPat8, false);
-
- kc.code = '9';
- pCommands->Add(kc, kcOrderlistPat9, false);
- kc.code = VK_NUMPAD9;
- pCommands->Add(kc, kcOrderlistPat9, false);
-
+ kc.code = 'U';
+ pCommands->Add(kc, kcOrderlistUnlockPlayback, false);
}
}
Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/mptrack/CommandSet.h 2012-09-21 21:10:38 UTC (rev 1357)
@@ -1213,8 +1213,7 @@
~CCommandSet(void);
//Population
- CString Add(KeyCombination kc, CommandID cmd, bool overwrite);
- CString Add(KeyCombination kc, CommandID cmd, bool overwrite, int pos);
+ CString Add(KeyCombination kc, CommandID cmd, bool overwrite, int pos = -1);
CString Remove(KeyCombination kc, CommandID cmd);
CString Remove(int pos, CommandID cmd);
Modified: trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp 2012-09-21 21:10:38 UTC (rev 1357)
@@ -59,14 +59,14 @@
BOOL CMidiMacroSetup::OnInitDialog()
//----------------------------------
{
- CHAR s[128];
+ char s[128];
CDialog::OnInitDialog();
CheckDlgButton(IDC_CHECK1, m_bEmbed ? BST_CHECKED : BST_UNCHECKED);
m_EditSFx.SetLimitText(MACRO_LENGTH - 1);
m_EditZxx.SetLimitText(MACRO_LENGTH - 1);
// Parametered macro selection
- for (UINT isfx=0; isfx<16; isfx++)
+ for(int isfx = 0; isfx < 16; isfx++)
{
wsprintf(s, "%d (SF%X)", isfx, isfx);
m_CbnSFx.AddString(s);
@@ -88,7 +88,7 @@
}
// Z80...ZFF box
- for (int zxx = 0; zxx < 128; zxx++)
+ for(int zxx = 0; zxx < 128; zxx++)
{
wsprintf(s, "Z%02X", zxx | 0x80);
m_CbnZxx.AddString(s);
@@ -201,12 +201,12 @@
void CMidiMacroSetup::UpdateDialog()
//----------------------------------
{
- CHAR s[MACRO_LENGTH];
+ char s[MACRO_LENGTH];
UINT sfx, sfx_preset, zxx;
sfx = m_CbnSFx.GetCurSel();
sfx_preset = m_CbnSFxPreset.GetItemData(m_CbnSFxPreset.GetCurSel());
- if (sfx < 16)
+ if(sfx < 16)
{
ToggleBoxes(sfx_preset, sfx);
memcpy(s, m_MidiCfg.szMidiSFXExt[sfx], MACRO_LENGTH);
@@ -215,7 +215,7 @@
}
zxx = m_CbnZxx.GetCurSel();
- if (zxx < 0x80)
+ if(zxx < 0x80)
{
memcpy(s, m_MidiCfg.szMidiZXXExt[zxx], MACRO_LENGTH);
StringFixer::SetNullTerminator(s);
@@ -319,7 +319,7 @@
{
if(ValidateMacroString(m_EditSFx, m_MidiCfg.szMidiSFXExt[sfx], true))
{
- CHAR s[MACRO_LENGTH];
+ char s[MACRO_LENGTH];
MemsetZero(s);
m_EditSFx.GetWindowText(s, MACRO_LENGTH);
StringFixer::SetNullTerminator(s);
@@ -342,7 +342,7 @@
{
if(ValidateMacroString(m_EditZxx, m_MidiCfg.szMidiZXXExt[zxx], false))
{
- CHAR s[MACRO_LENGTH];
+ char s[MACRO_LENGTH];
MemsetZero(s);
m_EditZxx.GetWindowText(s, MACRO_LENGTH);
StringFixer::SetNullTerminator(s);
@@ -510,8 +510,7 @@
wnd.SetSel(start - 1, end - 1, true);
MessageBeep(MB_OK);
return false;
- }
- else
+ } else
{
if(caseChange)
{
Modified: trunk/OpenMPT/mptrack/Stdafx.h
===================================================================
--- trunk/OpenMPT/mptrack/Stdafx.h 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/mptrack/Stdafx.h 2012-09-21 21:10:38 UTC (rev 1357)
@@ -40,7 +40,6 @@
#include <afxcmn.h> // MFC support for Windows Common Controls
#include <afxcview.h>
#include <afxole.h>
-#include <winreg.h>
#include <windowsx.h>
#pragma warning(disable:4201)
Modified: trunk/OpenMPT/mptrack/View_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_ins.cpp 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/mptrack/View_ins.cpp 2012-09-21 21:10:38 UTC (rev 1357)
@@ -2196,7 +2196,7 @@
plug->MidiSend(dwMidiData);
// Sending midi may modify the plug. For now, if MIDI data
// is not active sensing or aftertouch messages, set modified.
- if(dwMidiData != MIDIEvents::BuildSystemEvent(MIDIEvents::sysActiveSense) && event != MIDIEvents::evPolyAftertouch && event != MIDIEvents::evChannelAftertouch)
+ if(dwMidiData != MIDIEvents::System(MIDIEvents::sysActiveSense) && event != MIDIEvents::evPolyAftertouch && event != MIDIEvents::evChannelAftertouch)
{
CMainFrame::GetMainFrame()->ThreadSafeSetModified(pModDoc);
}
Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/mptrack/View_pat.cpp 2012-09-21 21:10:38 UTC (rev 1357)
@@ -3723,7 +3723,7 @@
plug->MidiSend(dwMidiData);
// Sending midi may modify the plug. For now, if MIDI data
// is not active sensing, set modified.
- if(dwMidiData != MIDIEvents::BuildSystemEvent(MIDIEvents::sysActiveSense))
+ if(dwMidiData != MIDIEvents::System(MIDIEvents::sysActiveSense))
pMainFrm->ThreadSafeSetModified(pModDoc);
}
Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp 2012-09-21 21:10:38 UTC (rev 1357)
@@ -2316,9 +2316,9 @@
VSTInstrChannel &channel = m_MidiCh[mc];
MidiPitchBend(mc, EncodePitchBendParam(MIDIEvents::pitchBendCentre)); // centre pitch bend
- MidiSend(MIDIEvents::BuildCCEvent(MIDIEvents::MIDICC_AllControllersOff, mc, 0)); // reset all controllers
- MidiSend(MIDIEvents::BuildCCEvent(MIDIEvents::MIDICC_AllNotesOff, mc, 0)); // all notes off
- MidiSend(MIDIEvents::BuildCCEvent(MIDIEvents::MIDICC_AllSoundOff, mc, 0)); // all sounds off
+ MidiSend(MIDIEvents::CC(MIDIEvents::MIDICC_AllControllersOff, mc, 0)); // reset all controllers
+ MidiSend(MIDIEvents::CC(MIDIEvents::MIDICC_AllNotesOff, mc, 0)); // all notes off
+ MidiSend(MIDIEvents::CC(MIDIEvents::MIDICC_AllSoundOff, mc, 0)); // all sounds off
for(size_t i = 0; i < CountOf(channel.uNoteOnMap); i++) //all notes
{
@@ -2326,7 +2326,7 @@
{
while(channel.uNoteOnMap[i][c])
{
- MidiSend(MIDIEvents::BuildNoteOffEvent(mc, static_cast<uint8>(i), 0));
+ MidiSend(MIDIEvents::NoteOff(mc, static_cast<uint8>(i), 0));
channel.uNoteOnMap[i][c]--;
}
}
@@ -2354,9 +2354,9 @@
LimitMax(nParam, uint8(127));
if(m_pSndFile && m_pSndFile->GetModFlag(MSF_MIDICC_BUGEMULATION))
- MidiSend(MIDIEvents::BuildEvent(MIDIEvents::evControllerChange, nMidiCh, nParam, static_cast<uint8>(nController))); // param and controller are swapped (old broken implementation)
+ MidiSend(MIDIEvents::Event(MIDIEvents::evControllerChange, nMidiCh, nParam, static_cast<uint8>(nController))); // param and controller are swapped (old broken implementation)
else
- MidiSend(MIDIEvents::BuildCCEvent(nController, nMidiCh, nParam));
+ MidiSend(MIDIEvents::CC(nController, nMidiCh, nParam));
}
@@ -2401,7 +2401,7 @@
{
ASSERT(EncodePitchBendParam(MIDIEvents::pitchBendMin) <= newPitchBendPos && newPitchBendPos <= EncodePitchBendParam(MIDIEvents::pitchBendMax));
m_MidiCh[nMidiCh].midiPitchBendPos = newPitchBendPos;
- MidiSend(MIDIEvents::BuildPitchBendEvent(nMidiCh, DecodePitchBendParam(newPitchBendPos)));
+ MidiSend(MIDIEvents::PitchBend(nMidiCh, DecodePitchBendParam(newPitchBendPos)));
}
@@ -2418,7 +2418,7 @@
int32 newPitchBendPos = (depth + m_MidiCh[nMidiCh].midiPitchBendPos) & vstPitchBendMask;
Limit(newPitchBendPos, EncodePitchBendParam(MIDIEvents::pitchBendMin), EncodePitchBendParam(MIDIEvents::pitchBendMax));
- MidiSend(MIDIEvents::BuildPitchBendEvent(nMidiCh, DecodePitchBendParam(newPitchBendPos)));
+ MidiSend(MIDIEvents::PitchBend(nMidiCh, DecodePitchBendParam(newPitchBendPos)));
}
// Update vibrato status
@@ -2452,11 +2452,11 @@
if((channel.currentBank >> 7) != high)
{
// High byte changed
- MidiSend(MIDIEvents::BuildCCEvent(MIDIEvents::MIDICC_BankSelect_Coarse, nMidiCh, high));
+ MidiSend(MIDIEvents::CC(MIDIEvents::MIDICC_BankSelect_Coarse, nMidiCh, high));
}
// Low byte
//GetSoundFile()->ProcessMIDIMacro(trackChannel, false, GetSoundFile()->m_MidiCfg.szMidiGlb[MIDIOUT_BANKSEL], 0);
- MidiSend(MIDIEvents::BuildCCEvent(MIDIEvents::MIDICC_BankSelect_Fine, nMidiCh, low));
+ MidiSend(MIDIEvents::CC(MIDIEvents::MIDICC_BankSelect_Fine, nMidiCh, low));
channel.currentBank = wMidiBank;
}
@@ -2468,7 +2468,7 @@
{
channel.currentProgram = nMidiProg;
//GetSoundFile()->ProcessMIDIMacro(trackChannel, false, GetSoundFile()->m_MidiCfg.szMidiGlb[MIDIOUT_PROGRAM], 0);
- MidiSend(MIDIEvents::BuildProgramChangeEvent(nMidiCh, nMidiProg));
+ MidiSend(MIDIEvents::ProgramChange(nMidiCh, nMidiProg));
}
@@ -2480,7 +2480,7 @@
if(channel.uNoteOnMap[i][trackChannel])
{
channel.uNoteOnMap[i][trackChannel]--;
- MidiSend(MIDIEvents::BuildNoteOffEvent(nMidiCh, i, 0));
+ MidiSend(MIDIEvents::NoteOff(nMidiCh, i, 0));
}
}
@@ -2489,14 +2489,14 @@
// Also less likely to cause a VST event buffer overflow.
else if (note == NOTE_NOTECUT) // ^^
{
- MidiSend(MIDIEvents::BuildCCEvent(MIDIEvents::MIDICC_AllNotesOff, nMidiCh, 0));
- MidiSend(MIDIEvents::BuildCCEvent(MIDIEvents::MIDICC_AllSoundOff, nMidiCh, 0));
+ MidiSend(MIDIEvents::CC(MIDIEvents::MIDICC_AllNotesOff, nMidiCh, 0));
+ MidiSend(MIDIEvents::CC(MIDIEvents::MIDICC_AllSoundOff, nMidiCh, 0));
// Turn off all notes
for(uint8 i = 0; i < 128; i++)
{
channel.uNoteOnMap[i][trackChannel] = 0;
- MidiSend(MIDIEvents::BuildNoteOffEvent(nMidiCh, i, volume));
+ MidiSend(MIDIEvents::NoteOff(nMidiCh, i, volume));
}
}
@@ -2510,7 +2510,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, volume)))
+ if(MidiSend(MIDIEvents::NoteOff(nMidiCh, i, volume)))
{
channel.uNoteOnMap[i][trackChannel]--;
} else
@@ -2543,7 +2543,7 @@
if(channel.uNoteOnMap[note][trackChannel] < 17)
channel.uNoteOnMap[note][trackChannel]++;
- MidiSend(MIDIEvents::BuildNoteOnEvent(nMidiCh, static_cast<uint8>(note), volume));
+ MidiSend(MIDIEvents::NoteOn(nMidiCh, static_cast<uint8>(note), volume));
}
}
Modified: trunk/OpenMPT/mptrack/test/test.cpp
===================================================================
--- trunk/OpenMPT/mptrack/test/test.cpp 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/mptrack/test/test.cpp 2012-09-21 21:10:38 UTC (rev 1357)
@@ -281,37 +281,37 @@
{
uint32 midiEvent;
- midiEvent = MIDIEvents::BuildCCEvent(MIDIEvents::MIDICC_Balance_Coarse, 13, 40);
+ midiEvent = MIDIEvents::CC(MIDIEvents::MIDICC_Balance_Coarse, 13, 40);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetTypeFromEvent(midiEvent), MIDIEvents::evControllerChange);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetChannelFromEvent(midiEvent), 13);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetDataByte1FromEvent(midiEvent), MIDIEvents::MIDICC_Balance_Coarse);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetDataByte2FromEvent(midiEvent), 40);
- midiEvent = MIDIEvents::BuildNoteOnEvent(10, 50, 120);
+ midiEvent = MIDIEvents::NoteOn(10, 50, 120);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetTypeFromEvent(midiEvent), MIDIEvents::evNoteOn);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetChannelFromEvent(midiEvent), 10);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetDataByte1FromEvent(midiEvent), 50);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetDataByte2FromEvent(midiEvent), 120);
- midiEvent = MIDIEvents::BuildNoteOffEvent(15, 127, 42);
+ midiEvent = MIDIEvents::NoteOff(15, 127, 42);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetTypeFromEvent(midiEvent), MIDIEvents::evNoteOff);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetChannelFromEvent(midiEvent), 15);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetDataByte1FromEvent(midiEvent), 127);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetDataByte2FromEvent(midiEvent), 42);
- midiEvent = MIDIEvents::BuildProgramChangeEvent(1, 127);
+ midiEvent = MIDIEvents::ProgramChange(1, 127);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetTypeFromEvent(midiEvent), MIDIEvents::evProgramChange);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetChannelFromEvent(midiEvent), 1);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetDataByte1FromEvent(midiEvent), 127);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetDataByte2FromEvent(midiEvent), 0);
- midiEvent = MIDIEvents::BuildPitchBendEvent(2, MIDIEvents::pitchBendCentre);
+ midiEvent = MIDIEvents::PitchBend(2, MIDIEvents::pitchBendCentre);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetTypeFromEvent(midiEvent), MIDIEvents::evPitchBend);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetChannelFromEvent(midiEvent), 2);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetDataByte1FromEvent(midiEvent), 0x00);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetDataByte2FromEvent(midiEvent), 0x40);
- midiEvent = MIDIEvents::BuildSystemEvent(MIDIEvents::sysStart);
+ midiEvent = MIDIEvents::System(MIDIEvents::sysStart);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetTypeFromEvent(midiEvent), MIDIEvents::evSystem);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetChannelFromEvent(midiEvent), MIDIEvents::sysStart);
VERIFY_EQUAL_NONCONT(MIDIEvents::GetDataByte1FromEvent(midiEvent), 0);
Modified: trunk/OpenMPT/soundlib/MIDIEvents.cpp
===================================================================
--- trunk/OpenMPT/soundlib/MIDIEvents.cpp 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/soundlib/MIDIEvents.cpp 2012-09-21 21:10:38 UTC (rev 1357)
@@ -15,56 +15,56 @@
{
// Build a generic MIDI event
-uint32 BuildEvent(EventType eventType, uint8 midiChannel, uint8 dataByte1, uint8 dataByte2)
-//-----------------------------------------------------------------------------------------
+uint32 Event(EventType eventType, uint8 midiChannel, uint8 dataByte1, uint8 dataByte2)
+//------------------------------------------------------------------------------------
{
return (eventType << 4) | (midiChannel & 0x0F) | (dataByte1 << 8) | (dataByte2 << 16);
}
// Build a MIDI CC event
-uint32 BuildCCEvent(MidiCC midiCC, uint8 midiChannel, uint8 param)
-//----------------------------------------------------------------
+uint32 CC(MidiCC midiCC, uint8 midiChannel, uint8 param)
+//------------------------------------------------------
{
- return BuildEvent(evControllerChange, midiChannel, static_cast<uint8>(midiCC), param);
+ return Event(evControllerChange, midiChannel, static_cast<uint8>(midiCC), param);
}
// Build a MIDI Pitchbend event
-uint32 BuildPitchBendEvent(uint8 midiChannel, uint16 bendAmount)
-//--------------------------------------------------------------
+uint32 PitchBend(uint8 midiChannel, uint16 bendAmount)
+//----------------------------------------------------
{
- return BuildEvent(evPitchBend, midiChannel, static_cast<uint8>(bendAmount & 0x7F), static_cast<uint8>(bendAmount >> 7));
+ return Event(evPitchBend, midiChannel, static_cast<uint8>(bendAmount & 0x7F), static_cast<uint8>(bendAmount >> 7));
}
// Build a MIDI Program Change event
-uint32 BuildProgramChangeEvent(uint8 midiChannel, uint8 program)
-//--------------------------------------------------------------
+uint32 ProgramChange(uint8 midiChannel, uint8 program)
+//----------------------------------------------------
{
- return BuildEvent(evProgramChange, midiChannel, program, 0);
+ return Event(evProgramChange, midiChannel, program, 0);
}
// Build a MIDI Note Off event
-uint32 BuildNoteOffEvent(uint8 midiChannel, uint8 note, uint8 velocity)
-//---------------------------------------------------------------------
+uint32 NoteOff(uint8 midiChannel, uint8 note, uint8 velocity)
+//-----------------------------------------------------------
{
- return BuildEvent(evNoteOff, midiChannel, note, velocity);
+ return Event(evNoteOff, midiChannel, note, velocity);
}
// Build a MIDI Note On event
-uint32 BuildNoteOnEvent(uint8 midiChannel, uint8 note, uint8 velocity)
-//--------------------------------------------------------------------
+uint32 NoteOn(uint8 midiChannel, uint8 note, uint8 velocity)
+//----------------------------------------------------------
{
- return BuildEvent(evNoteOn, midiChannel, note, velocity);
+ return Event(evNoteOn, midiChannel, note, velocity);
}
// Build a MIDI System Event
-uint8 BuildSystemEvent(SystemEvent eventType)
-//-------------------------------------------
+uint8 System(SystemEvent eventType)
+//---------------------------------
{
return static_cast<uint8>((evSystem << 4) | eventType);
}
Modified: trunk/OpenMPT/soundlib/MIDIEvents.h
===================================================================
--- trunk/OpenMPT/soundlib/MIDIEvents.h 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/soundlib/MIDIEvents.h 2012-09-21 21:10:38 UTC (rev 1357)
@@ -263,19 +263,19 @@
};
// Build a generic MIDI event
- uint32 BuildEvent(EventType eventType, uint8 midiChannel, uint8 dataByte1, uint8 dataByte2);
+ uint32 Event(EventType eventType, uint8 midiChannel, uint8 dataByte1, uint8 dataByte2);
// Build a MIDI CC event
- uint32 BuildCCEvent(MidiCC midiCC, uint8 midiChannel, uint8 param);
+ uint32 CC(MidiCC midiCC, uint8 midiChannel, uint8 param);
// Build a MIDI Pitchbend event
- uint32 BuildPitchBendEvent(uint8 midiChannel, uint16 bendAmount);
+ uint32 PitchBend(uint8 midiChannel, uint16 bendAmount);
// Build a MIDI Program Change event
- uint32 BuildProgramChangeEvent(uint8 midiChannel, uint8 program);
+ uint32 ProgramChange(uint8 midiChannel, uint8 program);
// Build a MIDI Note Off event
- uint32 BuildNoteOffEvent(uint8 midiChannel, uint8 note, uint8 velocity);
+ uint32 NoteOff(uint8 midiChannel, uint8 note, uint8 velocity);
// Build a MIDI Note On event
- uint32 BuildNoteOnEvent(uint8 midiChannel, uint8 note, uint8 velocity);
+ uint32 NoteOn(uint8 midiChannel, uint8 note, uint8 velocity);
// Build a MIDI System Event
- uint8 BuildSystemEvent(SystemEvent eventType);
+ uint8 System(SystemEvent eventType);
// Get MIDI channel from a MIDI event
uint8 GetChannelFromEvent(uint32 midiMsg);
Modified: trunk/OpenMPT/soundlib/ModSample.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModSample.cpp 2012-09-21 19:35:36 UTC (rev 1356)
+++ trunk/OpenMPT/soundlib/ModSample.cpp 2012-09-21 21:10:38 UTC (rev 1357)
@@ -97,21 +97,21 @@
nLength = 0;
nLoopStart = nLoopEnd = 0;
nSustainStart = nSustainEnd = 0;
+ nC5Speed = 8363;
+ nPan = 128;
nVolume = 256;
nGlobalVol = 64;
- nPan = 128;
- nC5Speed = 8363;
+ uFlags.reset(CHN_PANNING | CHN_SUSTAINLOOP | CHN_LOOP);
+ if(type == MOD_TYPE_XM)
+ {
+ uFlags.set(CHN_PANNING);
+ }
RelativeTone = 0;
nFineTune = 0;
nVibType = VIB_SINE;
nVibSweep = 0;
nVibDepth = 0;
nVibRate = 0;
- uFlags.reset(CHN_PANNING | CHN_SUSTAINLOOP | CHN_LOOP);
- if(type == MOD_TYPE_XM)
- {
- uFlags.set(CHN_PANNING);
- }
filename[0] = '\0';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
