Extracted a common midi related code to the midi/object classes (Gran…

…dOrgue#2103)

src/grandorgue/CMakeLists.txt

@@ -139,6 +139,11 @@ loader/cache/GOCache.cpp
 loader/cache/GOCacheCleaner.cpp
 loader/cache/GOCacheWriter.cpp
 midi/dialog-creator/GOMidiDialogCreatorProxy.cpp
+midi/objects/GOMidiObject.cpp
+midi/objects/GOMidiObjectWithDivision.cpp
+midi/objects/GOMidiObjectWithShortcut.cpp
+midi/objects/GOMidiReceivingSendingObject.cpp
+midi/objects/GOMidiSendingObject.cpp
 midi/ports/GOMidiInPort.cpp
 midi/ports/GOMidiOutPort.cpp
 midi/ports/GOMidiPort.cpp
@@ -158,7 +163,6 @@ midi/GOMidiShortcutPattern.cpp
 midi/GOMidiShortcutReceiver.cpp
 midi/GOMidiReceiver.cpp
 midi/GOMidiRecorder.cpp
-midi/objects/GOMidiObject.cpp
 model/pipe-config/GOPipeConfig.cpp
 model/pipe-config/GOPipeConfigNode.cpp
 model/pipe-config/GOPipeConfigTreeNode.cpp

src/grandorgue/GOMetronome.cpp

@@ -59,11 +59,11 @@ GOMetronome::GOMetronome(GOOrganController *organController)
     m_StopID(0) {
   CreateButtons(*m_OrganController);
 
-  m_buttons[ID_METRONOME_ON]->SetPreconfigIndex(25);
-  m_buttons[ID_METRONOME_MEASURE_P1]->SetPreconfigIndex(28);
-  m_buttons[ID_METRONOME_MEASURE_M1]->SetPreconfigIndex(29);
-  m_buttons[ID_METRONOME_BEAT_P1]->SetPreconfigIndex(26);
-  m_buttons[ID_METRONOME_BEAT_M1]->SetPreconfigIndex(27);
+  m_buttons[ID_METRONOME_ON]->SetInitialMidiIndex(25);
+  m_buttons[ID_METRONOME_MEASURE_P1]->SetInitialMidiIndex(28);
+  m_buttons[ID_METRONOME_MEASURE_M1]->SetInitialMidiIndex(29);
+  m_buttons[ID_METRONOME_BEAT_P1]->SetInitialMidiIndex(26);
+  m_buttons[ID_METRONOME_BEAT_M1]->SetInitialMidiIndex(27);
 
   m_OrganController->RegisterSoundStateHandler(this);
 }

src/grandorgue/GOVirtualCouplerController.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -39,7 +39,7 @@ void load_coupler(
     keyshift,
     dstManualN,
     couplerType);
-  pCoupler->SetElementID(organModel.GetRecorderElementID(
+  pCoupler->SetElementId(organModel.GetRecorderElementID(
     wxString::Format(recorderNameFmt, srcManualN, dstManualN)));
   pSrcManual->AddCoupler(pCoupler);
   manualCouplers.push_back(pCoupler);

src/grandorgue/combinations/GODivisionalSetter.cpp

@@ -170,7 +170,6 @@ void GODivisionalSetter::Load(GOConfigReader &cfg) {
 
       assert(divisional);
       divisional->Init(cfg, buttonName, wxString::Format(wxT("%d"), j + 1));
-      divisional->Load(cfg, buttonName);
       divisional->SetDisplayed(true);
     }
 

src/grandorgue/combinations/GOSetter.cpp

@@ -308,33 +308,33 @@ GOSetter::GOSetter(GOOrganController *organController)
     m_CrescendoCtrl(*organController) {
   CreateButtons(*m_OrganController);
 
-  m_buttons[ID_SETTER_PREV]->SetPreconfigIndex(0);
-  m_buttons[ID_SETTER_NEXT]->SetPreconfigIndex(1);
-  m_buttons[ID_SETTER_SET]->SetPreconfigIndex(2);
-  m_buttons[ID_SETTER_CURRENT]->SetPreconfigIndex(3);
-  m_buttons[ID_SETTER_GC]->SetPreconfigIndex(4);
-  m_buttons[ID_SETTER_M10]->SetPreconfigIndex(5);
-  m_buttons[ID_SETTER_P10]->SetPreconfigIndex(6);
-  m_buttons[ID_SETTER_L0]->SetPreconfigIndex(7);
-  m_buttons[ID_SETTER_L1]->SetPreconfigIndex(8);
-  m_buttons[ID_SETTER_L2]->SetPreconfigIndex(9);
-  m_buttons[ID_SETTER_L3]->SetPreconfigIndex(10);
-  m_buttons[ID_SETTER_L4]->SetPreconfigIndex(11);
-  m_buttons[ID_SETTER_L5]->SetPreconfigIndex(12);
-  m_buttons[ID_SETTER_L6]->SetPreconfigIndex(13);
-  m_buttons[ID_SETTER_L7]->SetPreconfigIndex(14);
-  m_buttons[ID_SETTER_L8]->SetPreconfigIndex(15);
-  m_buttons[ID_SETTER_L9]->SetPreconfigIndex(16);
-  m_buttons[ID_SETTER_PITCH_M1]->SetPreconfigIndex(17);
-  m_buttons[ID_SETTER_PITCH_P1]->SetPreconfigIndex(18);
-  m_buttons[ID_SETTER_PITCH_M100]->SetPreconfigIndex(19);
-  m_buttons[ID_SETTER_PITCH_P100]->SetPreconfigIndex(20);
-  m_buttons[ID_SETTER_TEMPERAMENT_PREV]->SetPreconfigIndex(21);
-  m_buttons[ID_SETTER_TEMPERAMENT_NEXT]->SetPreconfigIndex(22);
-  m_buttons[ID_SETTER_TRANSPOSE_DOWN]->SetPreconfigIndex(23);
-  m_buttons[ID_SETTER_TRANSPOSE_UP]->SetPreconfigIndex(24);
-  m_buttons[ID_SETTER_AUDIO_PANIC]->SetPreconfigIndex(25);
-  m_buttons[ID_SETTER_FILE_EXIT]->SetPreconfigIndex(26);
+  m_buttons[ID_SETTER_PREV]->SetInitialMidiIndex(0);
+  m_buttons[ID_SETTER_NEXT]->SetInitialMidiIndex(1);
+  m_buttons[ID_SETTER_SET]->SetInitialMidiIndex(2);
+  m_buttons[ID_SETTER_CURRENT]->SetInitialMidiIndex(3);
+  m_buttons[ID_SETTER_GC]->SetInitialMidiIndex(4);
+  m_buttons[ID_SETTER_M10]->SetInitialMidiIndex(5);
+  m_buttons[ID_SETTER_P10]->SetInitialMidiIndex(6);
+  m_buttons[ID_SETTER_L0]->SetInitialMidiIndex(7);
+  m_buttons[ID_SETTER_L1]->SetInitialMidiIndex(8);
+  m_buttons[ID_SETTER_L2]->SetInitialMidiIndex(9);
+  m_buttons[ID_SETTER_L3]->SetInitialMidiIndex(10);
+  m_buttons[ID_SETTER_L4]->SetInitialMidiIndex(11);
+  m_buttons[ID_SETTER_L5]->SetInitialMidiIndex(12);
+  m_buttons[ID_SETTER_L6]->SetInitialMidiIndex(13);
+  m_buttons[ID_SETTER_L7]->SetInitialMidiIndex(14);
+  m_buttons[ID_SETTER_L8]->SetInitialMidiIndex(15);
+  m_buttons[ID_SETTER_L9]->SetInitialMidiIndex(16);
+  m_buttons[ID_SETTER_PITCH_M1]->SetInitialMidiIndex(17);
+  m_buttons[ID_SETTER_PITCH_P1]->SetInitialMidiIndex(18);
+  m_buttons[ID_SETTER_PITCH_M100]->SetInitialMidiIndex(19);
+  m_buttons[ID_SETTER_PITCH_P100]->SetInitialMidiIndex(20);
+  m_buttons[ID_SETTER_TEMPERAMENT_PREV]->SetInitialMidiIndex(21);
+  m_buttons[ID_SETTER_TEMPERAMENT_NEXT]->SetInitialMidiIndex(22);
+  m_buttons[ID_SETTER_TRANSPOSE_DOWN]->SetInitialMidiIndex(23);
+  m_buttons[ID_SETTER_TRANSPOSE_UP]->SetInitialMidiIndex(24);
+  m_buttons[ID_SETTER_AUDIO_PANIC]->SetInitialMidiIndex(25);
+  m_buttons[ID_SETTER_FILE_EXIT]->SetInitialMidiIndex(26);
 
   m_buttons[ID_SETTER_PREV]->SetShortcutKey(37);
   m_buttons[ID_SETTER_NEXT]->SetShortcutKey(39);
@@ -1174,7 +1174,7 @@ void GOSetter::Crescendo(int newpos, bool force) {
 
 void GOSetter::ControlChanged(GOControl *control) {
   if (control == &m_CrescendoCtrl)
-    Crescendo(m_CrescendoCtrl.GetMidiValue() * CRESCENDO_STEPS / 128);
+    Crescendo(m_CrescendoCtrl.GetEnclosureValue() * CRESCENDO_STEPS / 128);
 }
 
 void GOSetter::UpdateTranspose() {

src/grandorgue/combinations/control/GODivisionalButtonControl.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -12,25 +12,17 @@
 #include "model/GOManual.h"
 #include "model/GOOrganModel.h"
 
+static const wxString WX_MIDI_TYPE_CODE = wxT("Divisional");
+static const wxString WX_MIDI_TYPE_NAME = _("Divisional");
+
 GODivisionalButtonControl::GODivisionalButtonControl(
   GOOrganModel &organModel, unsigned manualNumber, unsigned divisionalIndex)
-  : GOPushbuttonControl(organModel),
+  : GOPushbuttonControl(organModel, WX_MIDI_TYPE_CODE, WX_MIDI_TYPE_NAME),
     r_OrganModel(organModel),
     m_ManualN(manualNumber),
     m_DivisionalIndex(divisionalIndex),
     m_combination(organModel, manualNumber, false) {}
 
-const wxString WX_MIDI_TYPE_CODE = wxT("Divisional");
-const wxString WX_MIDI_TYPE = _("Divisional");
-
-const wxString &GODivisionalButtonControl::GetMidiTypeCode() const {
-  return WX_MIDI_TYPE_CODE;
-}
-
-const wxString &GODivisionalButtonControl::GetMidiType() const {
-  return WX_MIDI_TYPE;
-}
-
 void GODivisionalButtonControl::Init(
   GOConfigReader &cfg, const wxString &group, const wxString &name) {
   GOPushbuttonControl::Init(cfg, group, name);

src/grandorgue/combinations/control/GODivisionalButtonControl.h

@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -36,8 +36,6 @@ class GODivisionalButtonControl : public GOPushbuttonControl {
     GOOrganModel &organModel, unsigned manualNumber, unsigned divisionalIndex);
 
   GODivisionalCombination &GetCombination() { return m_combination; }
-  const wxString &GetMidiTypeCode() const override;
-  const wxString &GetMidiType() const override;
 
   void Init(GOConfigReader &cfg, const wxString &group, const wxString &name);
 

src/grandorgue/combinations/control/GOGeneralButtonControl.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -12,13 +12,16 @@
 #include "combinations/model/GOCombinationDefinition.h"
 #include "model/GOOrganModel.h"
 
+static const wxString WX_MIDI_TYPE_CODE = wxT("General");
+static const wxString WX_MIDI_TYPE_NAME = _("General");
+
 GOGeneralButtonControl::GOGeneralButtonControl(
   GOOrganModel &organModel, bool is_setter)
-  : GOPushbuttonControl(organModel),
+  : GOPushbuttonControl(organModel, WX_MIDI_TYPE_CODE, WX_MIDI_TYPE_NAME),
     r_OrganModel(organModel),
     m_combination(r_OrganModel, is_setter) {}
 
-void GOGeneralButtonControl::Load(GOConfigReader &cfg, wxString group) {
+void GOGeneralButtonControl::Load(GOConfigReader &cfg, const wxString &group) {
   m_combination.Load(cfg, group);
   GOPushbuttonControl::Load(cfg, group);
 }
@@ -30,14 +33,3 @@ void GOGeneralButtonControl::Push() {
 GOGeneralCombination &GOGeneralButtonControl::GetCombination() {
   return m_combination;
 }
-
-const wxString WX_MIDI_TYPE_CODE = wxT("General");
-const wxString WX_MIDI_TYPE = _("General");
-
-const wxString &GOGeneralButtonControl::GetMidiTypeCode() const {
-  return WX_MIDI_TYPE_CODE;
-}
-
-const wxString &GOGeneralButtonControl::GetMidiType() const {
-  return WX_MIDI_TYPE;
-}

src/grandorgue/combinations/control/GOGeneralButtonControl.h

@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -21,12 +21,9 @@ class GOGeneralButtonControl : public GOPushbuttonControl {
 
 public:
   GOGeneralButtonControl(GOOrganModel &organModel, bool is_setter);
-  void Load(GOConfigReader &cfg, wxString group);
+  void Load(GOConfigReader &cfg, const wxString &group) override;
   void Push() override;
   GOGeneralCombination &GetCombination();
-
-  const wxString &GetMidiTypeCode() const override;
-  const wxString &GetMidiType() const override;
 };
 
 #endif /* GOGENERAL_H */