diff --git a/src/Makefile b/src/Makefile
index 540ae684..b1ab935f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,7 +9,8 @@ CMSIS_DIR = ../CMSIS_5/CMSIS
OBJS = main.o kernel.o minidexed.o config.o userinterface.o uimenu.o \
mididevice.o midikeyboard.o serialmididevice.o pckeyboard.o \
sysexfileloader.o performanceconfig.o perftimer.o \
- effect_compressor.o effect_platervbstereo.o uibuttons.o midipin.o
+ effect_compressor.o effect_platervbstereo.o uibuttons.o midipin.o \
+ dawdisplay.o
OPTIMIZE = -O3
diff --git a/src/config.cpp b/src/config.cpp
index 98497d4b..aac853ca 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -197,6 +197,8 @@ void CConfig::Load (void)
m_MIDIButtonActionTGUp = m_Properties.GetString ("MIDIButtonActionTGUp", "");
m_MIDIButtonActionTGDown = m_Properties.GetString ("MIDIButtonActionTGDown", "");
+ m_bDAWDisplayEnabled = m_Properties.GetNumber ("DAWDisplayEnabled", 0) != 0;
+
m_bEncoderEnabled = m_Properties.GetNumber ("EncoderEnabled", 0) != 0;
m_nEncoderPinClock = m_Properties.GetNumber ("EncoderPinClock", 10);
m_nEncoderPinData = m_Properties.GetNumber ("EncoderPinData", 9);
@@ -703,6 +705,11 @@ const char *CConfig::GetMIDIButtonActionTGDown (void) const
return m_MIDIButtonActionTGDown.c_str();
}
+bool CConfig::GetDAWDisplayEnabled (void) const
+{
+ return m_bDAWDisplayEnabled;
+}
+
bool CConfig::GetEncoderEnabled (void) const
{
return m_bEncoderEnabled;
diff --git a/src/config.h b/src/config.h
index f85ef36c..6c1bf08b 100644
--- a/src/config.h
+++ b/src/config.h
@@ -232,6 +232,8 @@ class CConfig // Configuration for MiniDexed
const char *GetMIDIButtonActionTGUp (void) const;
const char *GetMIDIButtonActionTGDown (void) const;
+ bool GetDAWDisplayEnabled (void) const;
+
// KY-040 Rotary Encoder
// GPIO pin numbers are chip numbers, not header positions
bool GetEncoderEnabled (void) const;
@@ -355,6 +357,8 @@ class CConfig // Configuration for MiniDexed
std::string m_MIDIButtonActionTGUp;
std::string m_MIDIButtonActionTGDown;
+ bool m_bDAWDisplayEnabled;
+
bool m_bEncoderEnabled;
unsigned m_nEncoderPinClock;
unsigned m_nEncoderPinData;
diff --git a/src/dawdisplay.cpp b/src/dawdisplay.cpp
new file mode 100644
index 00000000..67f52e22
--- /dev/null
+++ b/src/dawdisplay.cpp
@@ -0,0 +1,134 @@
+//
+// dawdisplay.cpp
+//
+// MiniDexed - Dexed FM synthesizer for bare metal Raspberry Pi
+// Copyright (C) 2022 The MiniDexed Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+#include "dawdisplay.h"
+#include "midikeyboard.h"
+
+#include
+
+CDAWDisplay::CDAWDisplay (CMIDIKeyboard *pMIDIKeyboard)
+: m_pMIDIKeyboard (pMIDIKeyboard),
+ m_DisplayType (Unknown)
+{
+}
+
+void CDAWDisplay::OnConnect ()
+{
+ static const uint8_t inquiry[] = {0xF0, 0x7E, 0x7F, 0x06, 0x01, 0xF7};
+
+ m_DisplayType = Unknown;
+
+ m_pMIDIKeyboard->Send (inquiry, sizeof inquiry, 0);
+}
+
+void CDAWDisplay::MIDISysexHandler (u8 *pPacket, unsigned nLength, unsigned nCable)
+{
+ static const uint8_t pInquiryResp[] = {0xF0, 0x7E, 0x7F, 0x06, 0x02};
+ static const uint8_t pArturia[] = {0xF0, 0x7E, 0x7F, 0x06, 0x02, 0x00, 0x20, 0x6B};
+ static const uint8_t pMiniLab3[] = {0xF0, 0x7E, 0x7F, 0x06, 0x02, 0x00, 0x20, 0x6B, 0x02, 0x00, 0x04, 0x04};
+ static const uint8_t pKeyLabEs3_49[] = {0xF0, 0x7E, 0x7F, 0x06, 0x02, 0x00, 0x20, 0x6B, 0x02, 0x00, 0x05, 0x72};
+ static const uint8_t pKeyLabEs3_61[] = {0xF0, 0x7E, 0x7F, 0x06, 0x02, 0x00, 0x20, 0x6B, 0x02, 0x00, 0x05, 0x74};
+ static const uint8_t pKeyLabEs3_88[] = {0xF0, 0x7E, 0x7F, 0x06, 0x02, 0x00, 0x20, 0x6B, 0x02, 0x00, 0x05, 0x78};
+
+ static const uint8_t pArturiaDAWInit[] = {0xF0, 0x00, 0x20, 0x6B, 0x7F, 0x42, 0x02, 0x00, 0x40, 0x6A, 0x21, 0xF7};
+
+ if (nLength > sizeof pInquiryResp && memcmp (pPacket, pInquiryResp, sizeof pInquiryResp) != 0)
+ return;
+
+ if (nLength > sizeof pArturia && memcmp (pPacket, pArturia, sizeof pArturia) == 0)
+ {
+ m_pMIDIKeyboard->Send (pArturiaDAWInit, sizeof pArturiaDAWInit, 0);
+
+ if (nLength > sizeof pMiniLab3 && memcmp (pPacket, pMiniLab3, sizeof pMiniLab3) == 0)
+ {
+ m_DisplayType = MiniLab3;
+ DisplayWrite ("MiniDexed", "", "On MiniLab 3", 0, 0);
+ }
+
+ if (nLength > sizeof pKeyLabEs3_49 && (
+ memcmp (pPacket, pKeyLabEs3_49, sizeof pKeyLabEs3_49) == 0 ||
+ memcmp (pPacket, pKeyLabEs3_61, sizeof pKeyLabEs3_61) == 0 ||
+ memcmp (pPacket, pKeyLabEs3_88, sizeof pKeyLabEs3_88) == 0))
+ {
+ m_DisplayType = KeyLabEs3;
+ DisplayWrite ("MiniDexed", "", "On KeyLab 3 Essential", 0, 0);
+ }
+ }
+}
+
+void CDAWDisplay::ArturiaDisplayWrite (const u8 *pHdr, const unsigned nHdrSize, const char *pMenu, const char *pParam, const char *pValue)
+{
+ static unsigned L1MaxLen = 18;
+
+ CString line1 (pParam);
+ CString line2 (pValue);
+
+ size_t nLen = strlen (pParam) + strlen (pMenu);
+ if (nLen < L1MaxLen)
+ {
+ for (unsigned i = L1MaxLen - nLen; i > 0; i--)
+ {
+ line1.Append (" ");
+ }
+ }
+
+ line1.Append (pMenu);
+
+ int nLine1Len = strlen (line1);
+ int nLine2Len = strlen (line2);
+ int nOffset = 0;
+
+ uint8_t pLines[nHdrSize + nLine1Len + 2 + nLine2Len + 2];
+
+ memcpy (pLines, pHdr, nHdrSize);
+ nOffset += nHdrSize;
+
+ memcpy (&pLines[nOffset], line1, nLine1Len + 1);
+ nOffset += nLine1Len + 1;
+
+ pLines[nOffset] = 0x02;
+ nOffset += 1;
+
+ memcpy (&pLines[nOffset], line2, nLine2Len + 1);
+ nOffset += nLine2Len + 1;
+
+ pLines[nOffset] = 0xf7;
+ nOffset += 1;
+
+ m_pMIDIKeyboard->Send (pLines, nOffset, 0);
+}
+
+void CDAWDisplay::DisplayWrite (const char *pMenu, const char *pParam, const char *pValue,
+ bool bArrowDown, bool bArrowUp)
+{
+ static const uint8_t pMiniLab3Hdr[] = {0xF0, 0x00, 0x20, 0x6B, 0x7F, 0x42, 0x04, 0x02, 0x60, 0x12, 0x01};
+ static const uint8_t pKeyLabEs3Hdr[] = {0xF0, 0x00, 0x20, 0x6B, 0x7F, 0x42, 0x04, 0x01, 0x60, 0x12, 0x01};
+
+ switch (m_DisplayType)
+ {
+ case MiniLab3:
+ ArturiaDisplayWrite (pMiniLab3Hdr, sizeof pMiniLab3Hdr, pMenu, pParam, pValue);
+ break;
+ case KeyLabEs3:
+ ArturiaDisplayWrite (pKeyLabEs3Hdr, sizeof pKeyLabEs3Hdr, pMenu, pParam, pValue);
+ break;
+ default:
+ break;
+ }
+}
diff --git a/src/dawdisplay.h b/src/dawdisplay.h
new file mode 100644
index 00000000..e84ffe6d
--- /dev/null
+++ b/src/dawdisplay.h
@@ -0,0 +1,53 @@
+//
+// dawdisplay.h
+//
+// MiniDexed - Dexed FM synthesizer for bare metal Raspberry Pi
+// Copyright (C) 2022 The MiniDexed Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+#ifndef _dawdisplay_h
+#define _dawdisplay_h
+
+#include
+
+class CMIDIKeyboard;
+
+class CDAWDisplay
+{
+public:
+ CDAWDisplay (CMIDIKeyboard *pKeyboard);
+
+ void OnConnect ();
+ void MIDISysexHandler (u8 *pPacket, unsigned nLength, unsigned nCable);
+
+ void DisplayWrite (const char *pMenu, const char *pParam, const char *pValue,
+ bool bArrowDown, bool bArrowUp);
+
+private:
+ void ArturiaDisplayWrite (const u8 *pHdr, const unsigned nHdrSize, const char *pMenu, const char *pParam, const char *pValue);
+
+ enum TDisplayType
+ {
+ Unknown,
+ MiniLab3,
+ KeyLabEs3,
+ };
+
+ CMIDIKeyboard *m_pMIDIKeyboard;
+
+ TDisplayType m_DisplayType;
+};
+
+#endif
diff --git a/src/midikeyboard.cpp b/src/midikeyboard.cpp
index 2eae9d81..c4b5acdd 100644
--- a/src/midikeyboard.cpp
+++ b/src/midikeyboard.cpp
@@ -39,7 +39,8 @@ CMIDIKeyboard::CMIDIKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig, CUserI
: CMIDIDevice (pSynthesizer, pConfig, pUI),
m_nSysExIdx (0),
m_nInstance (nInstance),
- m_pMIDIDevice (0)
+ m_pMIDIDevice (0),
+ m_pDAWDisplay (0)
{
assert (m_nInstance < MaxInstances);
s_pThis[m_nInstance] = this;
@@ -47,12 +48,16 @@ CMIDIKeyboard::CMIDIKeyboard (CMiniDexed *pSynthesizer, CConfig *pConfig, CUserI
m_DeviceName.Format ("umidi%u", nInstance+1);
AddDevice (m_DeviceName);
+
+ if (pConfig->GetDAWDisplayEnabled ())
+ m_pDAWDisplay = new CDAWDisplay(this);
}
CMIDIKeyboard::~CMIDIKeyboard (void)
{
assert (m_nInstance < MaxInstances);
s_pThis[m_nInstance] = 0;
+ delete m_pDAWDisplay;
}
void CMIDIKeyboard::Process (boolean bPlugAndPlayUpdated)
@@ -85,6 +90,9 @@ void CMIDIKeyboard::Process (boolean bPlugAndPlayUpdated)
m_pMIDIDevice->RegisterPacketHandler (s_pMIDIPacketHandler[m_nInstance]);
m_pMIDIDevice->RegisterRemovedHandler (DeviceRemovedHandler, this);
+
+ if (m_pDAWDisplay)
+ m_pDAWDisplay->OnConnect();
}
}
}
@@ -136,6 +144,10 @@ void CMIDIKeyboard::USBMIDIMessageHandler (u8 *pPacket, unsigned nLength, unsign
m_SysEx[m_nSysExIdx++] = pPacket[i];
//printf ("SysEx End Idx=%d\n", m_nSysExIdx);
MIDIMessageHandler (m_SysEx, m_nSysExIdx, nCable);
+
+ if (m_pDAWDisplay)
+ m_pDAWDisplay->MIDISysexHandler (m_SysEx, m_nSysExIdx, nCable);
+
// Reset ready for next time
m_nSysExIdx = 0;
}
@@ -190,3 +202,10 @@ void CMIDIKeyboard::DeviceRemovedHandler (CDevice *pDevice, void *pContext)
pThis->m_pMIDIDevice = 0;
}
+
+void CMIDIKeyboard::DisplayWrite (const char *pMenu, const char *pParam, const char *pValue,
+ bool bArrowDown, bool bArrowUp)
+{
+ if (m_pMIDIDevice && m_pDAWDisplay)
+ m_pDAWDisplay->DisplayWrite (pMenu, pParam, pValue, bArrowDown, bArrowUp);
+}
diff --git a/src/midikeyboard.h b/src/midikeyboard.h
index 047fa523..44c48831 100644
--- a/src/midikeyboard.h
+++ b/src/midikeyboard.h
@@ -25,6 +25,7 @@
#include "mididevice.h"
#include "config.h"
+#include "dawdisplay.h"
#include
#include
#include
@@ -48,6 +49,9 @@ class CMIDIKeyboard : public CMIDIDevice
void Send (const u8 *pMessage, size_t nLength, unsigned nCable = 0) override;
+ void DisplayWrite (const char *pMenu, const char *pParam, const char *pValue,
+ bool bArrowDown, bool bArrowUp);
+
private:
static void MIDIPacketHandler0 (unsigned nCable, u8 *pPacket, unsigned nLength);
static void MIDIPacketHandler1 (unsigned nCable, u8 *pPacket, unsigned nLength);
@@ -76,6 +80,8 @@ class CMIDIKeyboard : public CMIDIDevice
std::queue m_SendQueue;
+ CDAWDisplay *m_pDAWDisplay;
+
static CMIDIKeyboard *s_pThis[MaxInstances];
static TMIDIPacketHandler * const s_pMIDIPacketHandler[MaxInstances];
diff --git a/src/minidexed.cpp b/src/minidexed.cpp
index 2e45f46b..795d7988 100644
--- a/src/minidexed.cpp
+++ b/src/minidexed.cpp
@@ -1775,6 +1775,17 @@ void CMiniDexed::setMasterVolume (float32_t vol)
nMasterVolume=vol;
}
+void CMiniDexed::DisplayWrite (const char *pMenu, const char *pParam, const char *pValue,
+ bool bArrowDown, bool bArrowUp)
+{
+ m_UI.DisplayWrite (pMenu, pParam, pValue, bArrowDown, bArrowUp);
+
+ for (unsigned i = 0; i < CConfig::MaxUSBMIDIDevices; i++)
+ {
+ m_pMIDIKeyboard[i]->DisplayWrite (pMenu, pParam, pValue, bArrowDown, bArrowUp);
+ }
+}
+
std::string CMiniDexed::GetPerformanceFileName(unsigned nID)
{
return m_PerformanceConfig.GetPerformanceFileName(nID);
diff --git a/src/minidexed.h b/src/minidexed.h
index 69dcf9ce..f79d69d7 100644
--- a/src/minidexed.h
+++ b/src/minidexed.h
@@ -228,6 +228,9 @@ class CMiniDexed
void setMasterVolume (float32_t vol);
+ void DisplayWrite (const char *pMenu, const char *pParam, const char *pValue,
+ bool bArrowDown, bool bArrowUp);
+
private:
int16_t ApplyNoteLimits (int16_t pitch, unsigned nTG); // returns < 0 to ignore note
uint8_t m_uchOPMask[CConfig::AllToneGenerators];
diff --git a/src/minidexed.ini b/src/minidexed.ini
index d04d9988..6ad21a5d 100644
--- a/src/minidexed.ini
+++ b/src/minidexed.ini
@@ -139,6 +139,9 @@ MIDIButtonActionTGUp=
MIDIButtonTGDown=0
MIDIButtonActionTGDown=
+# DAW Display (Arturia MiniLab 3, KeyLab Essential 3)
+DAWDisplayEnabled=0
+
# KY-040 Rotary Encoder
EncoderEnabled=1
EncoderPinClock=10
diff --git a/src/uimenu.cpp b/src/uimenu.cpp
index 8b724250..8ece5779 100644
--- a/src/uimenu.cpp
+++ b/src/uimenu.cpp
@@ -534,7 +534,7 @@ void CUIMenu::MenuHandler (CUIMenu *pUIMenu, TMenuEvent Event)
if (pUIMenu->m_pCurrentMenu) // if this is another menu?
{
- pUIMenu->m_pUI->DisplayWrite (
+ pUIMenu->m_pMiniDexed->DisplayWrite (
pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name,
"",
pUIMenu->m_pCurrentMenu[pUIMenu->m_nCurrentSelection].Name,
@@ -587,7 +587,7 @@ void CUIMenu::EditGlobalParameter (CUIMenu *pUIMenu, TMenuEvent Event)
string Value = GetGlobalValueString (Param, pUIMenu->m_pMiniDexed->GetParameter (Param));
- pUIMenu->m_pUI->DisplayWrite (pMenuName,
+ pUIMenu->m_pMiniDexed->DisplayWrite (pMenuName,
pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name,
Value.c_str (),
nValue > rParam.Minimum, nValue < rParam.Maximum);
@@ -631,7 +631,7 @@ void CUIMenu::EditVoiceBankNumber (CUIMenu *pUIMenu, TMenuEvent Event)
string Value = to_string (nValue+1) + "="
+ pUIMenu->m_pMiniDexed->GetSysExFileLoader ()->GetBankName (nValue);
- pUIMenu->m_pUI->DisplayWrite (TG.c_str (),
+ pUIMenu->m_pMiniDexed->DisplayWrite (TG.c_str (),
pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name,
Value.c_str (),
nValue > 0, nValue < (int) CSysExFileLoader::MaxVoiceBankID);
@@ -701,7 +701,7 @@ void CUIMenu::EditProgramNumber (CUIMenu *pUIMenu, TMenuEvent Event)
string Value = to_string (nValue+1) + "=" + pUIMenu->m_pMiniDexed->GetVoiceName (nTG);
- pUIMenu->m_pUI->DisplayWrite (TG.c_str (),
+ pUIMenu->m_pMiniDexed->DisplayWrite (TG.c_str (),
pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name,
Value.c_str (),
nValue > 0, nValue < (int) CSysExFileLoader::VoicesPerBank-1);
@@ -754,7 +754,7 @@ void CUIMenu::EditTGParameter (CUIMenu *pUIMenu, TMenuEvent Event)
string Value = GetTGValueString (Param, pUIMenu->m_pMiniDexed->GetTGParameter (Param, nTG));
- pUIMenu->m_pUI->DisplayWrite (TG.c_str (),
+ pUIMenu->m_pMiniDexed->DisplayWrite (TG.c_str (),
pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name,
Value.c_str (),
nValue > rParam.Minimum, nValue < rParam.Maximum);
@@ -807,7 +807,7 @@ void CUIMenu::EditTGParameter2 (CUIMenu *pUIMenu, TMenuEvent Event) // second me
string Value = GetTGValueString (Param, pUIMenu->m_pMiniDexed->GetTGParameter (Param, nTG));
- pUIMenu->m_pUI->DisplayWrite (TG.c_str (),
+ pUIMenu->m_pMiniDexed->DisplayWrite (TG.c_str (),
pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name,
Value.c_str (),
nValue > rParam.Minimum, nValue < rParam.Maximum);
@@ -860,7 +860,7 @@ void CUIMenu::EditVoiceParameter (CUIMenu *pUIMenu, TMenuEvent Event)
string Value = GetVoiceValueString (nParam, nValue);
- pUIMenu->m_pUI->DisplayWrite (TG.c_str (),
+ pUIMenu->m_pMiniDexed->DisplayWrite (TG.c_str (),
pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name,
Value.c_str (),
nValue > rParam.Minimum, nValue < rParam.Maximum);
@@ -963,7 +963,7 @@ void CUIMenu::EditOPParameter (CUIMenu *pUIMenu, TMenuEvent Event)
Value = GetOPValueString (nParam, nValue);
}
- pUIMenu->m_pUI->DisplayWrite (OP.c_str (),
+ pUIMenu->m_pMiniDexed->DisplayWrite (OP.c_str (),
pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name,
Value.c_str (),
nValue > rParam.Minimum, nValue < rParam.Maximum);
@@ -982,7 +982,7 @@ void CUIMenu::SavePerformance (CUIMenu *pUIMenu, TMenuEvent Event)
pUIMenu->m_MenuStackParent[pUIMenu->m_nCurrentMenuDepth-1]
[pUIMenu->m_nMenuStackItem[pUIMenu->m_nCurrentMenuDepth-1]].Name;
- pUIMenu->m_pUI->DisplayWrite (pMenuName,
+ pUIMenu->m_pMiniDexed->DisplayWrite (pMenuName,
pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name,
bOK ? "Completed" : "Error",
false, false);
@@ -1564,7 +1564,7 @@ void CUIMenu::PerformanceMenu (CUIMenu *pUIMenu, TMenuEvent Event)
{
pUIMenu->m_nSelectedPerformanceID = 0;
pUIMenu->m_bConfirmDeletePerformance=false;
- pUIMenu->m_pUI->DisplayWrite ("", "Delete", pUIMenu->m_pMiniDexed->DeletePerformance(nValue) ? "Completed" : "Error", false, false);
+ pUIMenu->m_pMiniDexed->DisplayWrite ("", "Delete", pUIMenu->m_pMiniDexed->DeletePerformance(nValue) ? "Completed" : "Error", false, false);
pUIMenu->m_bSplashShow=true;
CTimer::Get ()->StartKernelTimer (MSEC2HZ (1500), TimerHandlerNoBack, 0, pUIMenu);
return;
@@ -1597,13 +1597,13 @@ void CUIMenu::PerformanceMenu (CUIMenu *pUIMenu, TMenuEvent Event)
nPSelected += " [L]";
}
- pUIMenu->m_pUI->DisplayWrite (pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name, nPSelected.c_str(),
+ pUIMenu->m_pMiniDexed->DisplayWrite (pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name, nPSelected.c_str(),
Value.c_str (), true, true);
// (int) nValue > 0, (int) nValue < (int) pUIMenu->m_pMiniDexed->GetLastPerformance());
}
else
{
- pUIMenu->m_pUI->DisplayWrite ("", "Delete?", pUIMenu->m_bConfirmDeletePerformance ? "Yes" : "No", false, false);
+ pUIMenu->m_pMiniDexed->DisplayWrite ("", "Delete?", pUIMenu->m_bConfirmDeletePerformance ? "Yes" : "No", false, false);
}
}
@@ -1685,7 +1685,7 @@ void CUIMenu::EditPerformanceBankNumber (CUIMenu *pUIMenu, TMenuEvent Event)
nPSelected += " [L]";
}
- pUIMenu->m_pUI->DisplayWrite (pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name, nPSelected.c_str(),
+ pUIMenu->m_pMiniDexed->DisplayWrite (pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name, nPSelected.c_str(),
Value.c_str (),
nValue > 0,
nValue < pUIMenu->m_pMiniDexed->GetLastPerformanceBank()-1);
@@ -1798,7 +1798,7 @@ void CUIMenu::InputTxt (CUIMenu *pUIMenu, TMenuEvent Event)
pUIMenu->m_pMiniDexed->SetNewPerformanceName(pUIMenu->m_InputText);
bOK = pUIMenu->m_pMiniDexed->SavePerformanceNewFile ();
MsgOk=bOK ? "Completed" : "Error";
- pUIMenu->m_pUI->DisplayWrite (OkTitleR.c_str(), OkTitleL.c_str(), MsgOk.c_str(), false, false);
+ pUIMenu->m_pMiniDexed->DisplayWrite (OkTitleR.c_str(), OkTitleL.c_str(), MsgOk.c_str(), false, false);
CTimer::Get ()->StartKernelTimer (MSEC2HZ (1500), TimerHandler, 0, pUIMenu);
return;
}
@@ -1849,7 +1849,7 @@ void CUIMenu::InputTxt (CUIMenu *pUIMenu, TMenuEvent Event)
}
Value = Value + " " + escCursor ;
- pUIMenu->m_pUI->DisplayWrite (MenuTitleR.c_str(),MenuTitleL.c_str(), Value.c_str(), false, false);
+ pUIMenu->m_pMiniDexed->DisplayWrite (MenuTitleR.c_str(),MenuTitleL.c_str(), Value.c_str(), false, false);
}
@@ -1903,7 +1903,7 @@ void CUIMenu::EditTGParameterModulation (CUIMenu *pUIMenu, TMenuEvent Event)
string Value = GetTGValueString (Param, pUIMenu->m_pMiniDexed->GetTGParameter (Param, nTG));
- pUIMenu->m_pUI->DisplayWrite (TG.c_str (),
+ pUIMenu->m_pMiniDexed->DisplayWrite (TG.c_str (),
pUIMenu->m_pParentMenu[pUIMenu->m_nCurrentMenuItem].Name,
Value.c_str (),
nValue > rParam.Minimum, nValue < rParam.Maximum);