Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[533] trunk/OpenMPT
|
From: <sag...@us...> - 2010-03-15 20:28:07
|
Revision: 533
http://modplug.svn.sourceforge.net/modplug/?rev=533&view=rev
Author: saga-games
Date: 2010-03-15 20:27:57 +0000 (Mon, 15 Mar 2010)
Log Message:
-----------
[Imp] MT2 Loader: Make use of the "lines per beat" header field.
[Imp] VST Editor: Added shortcuts for "toggle bypass", "pass keys to plug" and "record params to pattern"
[Mod] Keymaps: Updated DE_jojo.mkb with the new VST Editor shortcuts.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/CommandSet.h
trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb
trunk/OpenMPT/soundlib/Load_mt2.cpp
Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2010-03-14 18:43:27 UTC (rev 532)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2010-03-15 20:27:57 UTC (rev 533)
@@ -311,13 +311,14 @@
switch(wParam)
{
- case kcVSTGUIPrevPreset: OnSetPreviousVSTPreset(); return wParam;
- case kcVSTGUIPrevPresetJump:OnVSTPresetBackwardJump(); return wParam;
- case kcVSTGUINextPreset: OnSetNextVSTPreset(); return wParam;
- case kcVSTGUINextPresetJump:OnVSTPresetForwardJump(); return wParam;
- case kcVSTGUIRandParams: OnRandomizePreset() ; return wParam;
-
-
+ case kcVSTGUIPrevPreset: OnSetPreviousVSTPreset(); return wParam;
+ case kcVSTGUIPrevPresetJump: OnVSTPresetBackwardJump(); return wParam;
+ case kcVSTGUINextPreset: OnSetNextVSTPreset(); return wParam;
+ case kcVSTGUINextPresetJump: OnVSTPresetForwardJump(); return wParam;
+ case kcVSTGUIRandParams: OnRandomizePreset() ; return wParam;
+ case kcVSTGUIToggleRecordParams: OnRecordAutomation(); return wParam;
+ case kcVSTGUIToggleSendKeysToPlug: OnPassKeypressesToPlug(); return wParam;
+ case kcVSTGUIBypassPlug: OnBypassPlug(); return wParam;
}
if (wParam>=kcVSTGUIStartNotes && wParam<=kcVSTGUIEndNotes)
{
@@ -590,21 +591,22 @@
void CAbstractVstEditor::UpdateOptionsMenu() {
//--------------------------------------------
- if (m_pOptionsMenu->m_hMenu) {
+ if (m_pOptionsMenu->m_hMenu)
m_pOptionsMenu->DestroyMenu();
- }
+ CInputHandler* ih = (CMainFrame::GetMainFrame())->GetInputHandler();
+
m_pOptionsMenu->CreatePopupMenu();
//Bypass
m_pOptionsMenu->AppendMenu(MF_STRING | m_pVstPlugin->IsBypassed()?MF_CHECKED:0,
- ID_PLUG_BYPASS, "&Bypass");
+ ID_PLUG_BYPASS, "&Bypass\t" + ih->GetKeyTextFromCommand(kcVSTGUIBypassPlug));
//Record Params
m_pOptionsMenu->AppendMenu(MF_STRING | m_pVstPlugin->m_bRecordAutomation?MF_CHECKED:0,
- ID_PLUG_RECORDAUTOMATION, "Record &Params");
+ ID_PLUG_RECORDAUTOMATION, "Record &Params\t" + ih->GetKeyTextFromCommand(kcVSTGUIToggleRecordParams));
//Pass on keypresses
m_pOptionsMenu->AppendMenu(MF_STRING | m_pVstPlugin->m_bPassKeypressesToPlug?MF_CHECKED:0,
- ID_PLUG_PASSKEYS, "Pass &Keys to Plug");
+ ID_PLUG_PASSKEYS, "Pass &Keys to Plug\t" + ih->GetKeyTextFromCommand(kcVSTGUIToggleSendKeysToPlug));
m_pMenu->DeleteMenu(3, MF_BYPOSITION);
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2010-03-14 18:43:27 UTC (rev 532)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2010-03-15 20:27:57 UTC (rev 533)
@@ -2575,6 +2575,21 @@
commands[kcInstrumentEnvelopeZoomOut].isDummy = false;
commands[kcInstrumentEnvelopeZoomOut].Message = "Zoom Out";
+ commands[kcVSTGUIToggleRecordParams].UID = 1839;
+ commands[kcVSTGUIToggleRecordParams].isHidden = false;
+ commands[kcVSTGUIToggleRecordParams].isDummy = false;
+ commands[kcVSTGUIToggleRecordParams].Message = "Toggle parameter recording";
+
+ commands[kcVSTGUIToggleSendKeysToPlug].UID = 1840;
+ commands[kcVSTGUIToggleSendKeysToPlug].isHidden = false;
+ commands[kcVSTGUIToggleSendKeysToPlug].isDummy = false;
+ commands[kcVSTGUIToggleSendKeysToPlug].Message = "Pass key presses to plugin";
+
+ commands[kcVSTGUIBypassPlug].UID = 1841;
+ commands[kcVSTGUIBypassPlug].isHidden = false;
+ commands[kcVSTGUIBypassPlug].isDummy = false;
+ commands[kcVSTGUIBypassPlug].Message = "Bypass plugin";
+
#ifdef _DEBUG
for (int i=0; i<kcNumCommands; i++) {
if (commands[i].UID != 0) { // ignore unset UIDs
Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h 2010-03-14 18:43:27 UTC (rev 532)
+++ trunk/OpenMPT/mptrack/CommandSet.h 2010-03-15 20:27:57 UTC (rev 533)
@@ -983,7 +983,10 @@
kcVSTGUIPrevPresetJump,
kcVSTGUINextPresetJump,
kcVSTGUIRandParams,
- kcEndVSTGUICommands=kcVSTGUIRandParams,
+ kcVSTGUIToggleRecordParams,
+ kcVSTGUIToggleSendKeysToPlug,
+ kcVSTGUIBypassPlug,
+ kcEndVSTGUICommands=kcVSTGUIBypassPlug,
kcStartOrderlistCommands,
// Orderlist edit
Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb
===================================================================
--- trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb 2010-03-14 18:43:27 UTC (rev 532)
+++ trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb 2010-03-15 20:27:57 UTC (rev 533)
@@ -306,7 +306,10 @@
13:1764:0:39:1 //Next plugin preset: NACH-RECHTS (KeyDown)
13:1782:0:38:1 //Plugin preset backward jump: NACH-OBEN (KeyDown)
13:1783:0:40:1 //Plugin preset forward jump: NACH-UNTEN (KeyDown)
-13:1765:2:82:1 //Randomize plugin parameters: Ctrl+R (KeyDown)
+13:1765:2:80:1 //Randomize plugin parameters: Ctrl+P (KeyDown)
+13:1839:2:82:1 //Toggle parameter recording: Ctrl+R (KeyDown)
+13:1840:2:75:1 //Pass key presses to plugin: Ctrl+K (KeyDown)
+13:1841:2:66:1 //Bypass plugin: Ctrl+B (KeyDown)
//----( General Context [top] (14) )------------
Modified: trunk/OpenMPT/soundlib/Load_mt2.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mt2.cpp 2010-03-14 18:43:27 UTC (rev 532)
+++ trunk/OpenMPT/soundlib/Load_mt2.cpp 2010-03-15 20:27:57 UTC (rev 533)
@@ -202,6 +202,8 @@
m_nDefaultSpeed = pfh->bTicksPerLine;
m_nDefaultTempo = 125;
m_dwSongFlags = SONG_ITCOMPATMODE;
+ m_nRowsPerBeat = pfh->bLinesPerBeat;
+ m_nRowsPerMeasure = m_nRowsPerBeat * 4;
if ((pfh->wSamplesPerTick > 100) && (pfh->wSamplesPerTick < 5000))
{
m_nDefaultTempo = 110250 / pfh->wSamplesPerTick;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
