From fb9e383b87cb1a1bf046ac414c0a05f4f91ec428 Mon Sep 17 00:00:00 2001 From: diyelectromusic <68612569+diyelectromusic@users.noreply.github.com> Date: Sat, 27 May 2023 14:26:20 +0100 Subject: [PATCH] Minor fixups in formatting and so on after review. --- src/config.h | 2 +- src/minidexed.cpp | 3 +-- src/minidexed.h | 1 - src/userinterface.cpp | 16 ++++++++-------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/config.h b/src/config.h index 1010003..fa74241 100644 --- a/src/config.h +++ b/src/config.h @@ -110,7 +110,7 @@ public: unsigned GetButtonPinSelect (void) const; unsigned GetButtonPinHome (void) const; unsigned GetButtonPinShortcut (void) const; - + // Action type for buttons: "click", "doubleclick", "longpress", "" const char *GetButtonActionPrev (void) const; const char *GetButtonActionNext (void) const; diff --git a/src/minidexed.cpp b/src/minidexed.cpp index 136b47b..da96d2f 100644 --- a/src/minidexed.cpp +++ b/src/minidexed.cpp @@ -415,8 +415,6 @@ void CMiniDexed::ProgramChange (unsigned nProgram, unsigned nTG) { assert (m_pConfig); - // Program Change messages change voice on specified TG - unsigned nBankOffset; bool bPCAcrossBanks = m_pConfig->GetExpandPCAcrossBanks(); if (bPCAcrossBanks) @@ -489,6 +487,7 @@ void CMiniDexed::ProgramChangePerformance (unsigned nProgram, unsigned nTG) } else { + // Program Change messages change voice on specified TG ProgramChange(nProgram, nTG); } diff --git a/src/minidexed.h b/src/minidexed.h index f09c5ca..8a05a34 100644 --- a/src/minidexed.h +++ b/src/minidexed.h @@ -140,7 +140,6 @@ public: ParameterReverbLowPass, ParameterReverbDiffusion, ParameterReverbLevel, - ParameterPerformanceProgramChange, ParameterUnknown }; diff --git a/src/userinterface.cpp b/src/userinterface.cpp index 247326e..890232f 100644 --- a/src/userinterface.cpp +++ b/src/userinterface.cpp @@ -115,14 +115,14 @@ bool CUserInterface::Initialize (void) m_pConfig->GetButtonActionSelect (), m_pConfig->GetButtonPinHome (), m_pConfig->GetButtonActionHome (), - m_pConfig->GetButtonPinPgmUp (), - m_pConfig->GetButtonActionPgmUp (), - m_pConfig->GetButtonPinPgmDown (), - m_pConfig->GetButtonActionPgmDown (), - m_pConfig->GetButtonPinTGUp (), - m_pConfig->GetButtonActionTGUp (), - m_pConfig->GetButtonPinTGDown (), - m_pConfig->GetButtonActionTGDown (), + m_pConfig->GetButtonPinPgmUp (), + m_pConfig->GetButtonActionPgmUp (), + m_pConfig->GetButtonPinPgmDown (), + m_pConfig->GetButtonActionPgmDown (), + m_pConfig->GetButtonPinTGUp (), + m_pConfig->GetButtonActionTGUp (), + m_pConfig->GetButtonPinTGDown (), + m_pConfig->GetButtonActionTGDown (), m_pConfig->GetDoubleClickTimeout (), m_pConfig->GetLongPressTimeout (), m_pConfig->GetMIDIButtonNotes (),