Skip to content

Commit 5af8e48

Browse files
oleg68oleg68
authored
Extracted a common midi related code to the midi/object classes (#2103)
1 parent b831e56 commit 5af8e48

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1537
-1359
lines changed

‎ide-projects/NetBeans12/nbproject/configurations.xml

+621-633
Large diffs are not rendered by default.

‎src/grandorgue/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ loader/cache/GOCache.cpp
139139
loader/cache/GOCacheCleaner.cpp
140140
loader/cache/GOCacheWriter.cpp
141141
midi/dialog-creator/GOMidiDialogCreatorProxy.cpp
142+
midi/objects/GOMidiObject.cpp
143+
midi/objects/GOMidiObjectWithDivision.cpp
144+
midi/objects/GOMidiObjectWithShortcut.cpp
145+
midi/objects/GOMidiReceivingSendingObject.cpp
146+
midi/objects/GOMidiSendingObject.cpp
142147
midi/ports/GOMidiInPort.cpp
143148
midi/ports/GOMidiOutPort.cpp
144149
midi/ports/GOMidiPort.cpp
@@ -158,7 +163,6 @@ midi/GOMidiShortcutPattern.cpp
158163
midi/GOMidiShortcutReceiver.cpp
159164
midi/GOMidiReceiver.cpp
160165
midi/GOMidiRecorder.cpp
161-
midi/objects/GOMidiObject.cpp
162166
model/pipe-config/GOPipeConfig.cpp
163167
model/pipe-config/GOPipeConfigNode.cpp
164168
model/pipe-config/GOPipeConfigTreeNode.cpp

‎src/grandorgue/GOMetronome.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ GOMetronome::GOMetronome(GOOrganController *organController)
5959
m_StopID(0) {
6060
CreateButtons(*m_OrganController);
6161

62-
m_buttons[ID_METRONOME_ON]->SetPreconfigIndex(25);
63-
m_buttons[ID_METRONOME_MEASURE_P1]->SetPreconfigIndex(28);
64-
m_buttons[ID_METRONOME_MEASURE_M1]->SetPreconfigIndex(29);
65-
m_buttons[ID_METRONOME_BEAT_P1]->SetPreconfigIndex(26);
66-
m_buttons[ID_METRONOME_BEAT_M1]->SetPreconfigIndex(27);
62+
m_buttons[ID_METRONOME_ON]->SetInitialMidiIndex(25);
63+
m_buttons[ID_METRONOME_MEASURE_P1]->SetInitialMidiIndex(28);
64+
m_buttons[ID_METRONOME_MEASURE_M1]->SetInitialMidiIndex(29);
65+
m_buttons[ID_METRONOME_BEAT_P1]->SetInitialMidiIndex(26);
66+
m_buttons[ID_METRONOME_BEAT_M1]->SetInitialMidiIndex(27);
6767

6868
m_OrganController->RegisterSoundStateHandler(this);
6969
}

‎src/grandorgue/GOVirtualCouplerController.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright 2006 Milan Digital Audio LLC
3-
* Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
3+
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
44
* License GPL-2.0 or later
55
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
66
*/
@@ -39,7 +39,7 @@ void load_coupler(
3939
keyshift,
4040
dstManualN,
4141
couplerType);
42-
pCoupler->SetElementID(organModel.GetRecorderElementID(
42+
pCoupler->SetElementId(organModel.GetRecorderElementID(
4343
wxString::Format(recorderNameFmt, srcManualN, dstManualN)));
4444
pSrcManual->AddCoupler(pCoupler);
4545
manualCouplers.push_back(pCoupler);

‎src/grandorgue/combinations/GODivisionalSetter.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ void GODivisionalSetter::Load(GOConfigReader &cfg) {
170170

171171
assert(divisional);
172172
divisional->Init(cfg, buttonName, wxString::Format(wxT("%d"), j + 1));
173-
divisional->Load(cfg, buttonName);
174173
divisional->SetDisplayed(true);
175174
}
176175

‎src/grandorgue/combinations/GOSetter.cpp

+28-28
Original file line numberDiff line numberDiff line change
@@ -308,33 +308,33 @@ GOSetter::GOSetter(GOOrganController *organController)
308308
m_CrescendoCtrl(*organController) {
309309
CreateButtons(*m_OrganController);
310310

311-
m_buttons[ID_SETTER_PREV]->SetPreconfigIndex(0);
312-
m_buttons[ID_SETTER_NEXT]->SetPreconfigIndex(1);
313-
m_buttons[ID_SETTER_SET]->SetPreconfigIndex(2);
314-
m_buttons[ID_SETTER_CURRENT]->SetPreconfigIndex(3);
315-
m_buttons[ID_SETTER_GC]->SetPreconfigIndex(4);
316-
m_buttons[ID_SETTER_M10]->SetPreconfigIndex(5);
317-
m_buttons[ID_SETTER_P10]->SetPreconfigIndex(6);
318-
m_buttons[ID_SETTER_L0]->SetPreconfigIndex(7);
319-
m_buttons[ID_SETTER_L1]->SetPreconfigIndex(8);
320-
m_buttons[ID_SETTER_L2]->SetPreconfigIndex(9);
321-
m_buttons[ID_SETTER_L3]->SetPreconfigIndex(10);
322-
m_buttons[ID_SETTER_L4]->SetPreconfigIndex(11);
323-
m_buttons[ID_SETTER_L5]->SetPreconfigIndex(12);
324-
m_buttons[ID_SETTER_L6]->SetPreconfigIndex(13);
325-
m_buttons[ID_SETTER_L7]->SetPreconfigIndex(14);
326-
m_buttons[ID_SETTER_L8]->SetPreconfigIndex(15);
327-
m_buttons[ID_SETTER_L9]->SetPreconfigIndex(16);
328-
m_buttons[ID_SETTER_PITCH_M1]->SetPreconfigIndex(17);
329-
m_buttons[ID_SETTER_PITCH_P1]->SetPreconfigIndex(18);
330-
m_buttons[ID_SETTER_PITCH_M100]->SetPreconfigIndex(19);
331-
m_buttons[ID_SETTER_PITCH_P100]->SetPreconfigIndex(20);
332-
m_buttons[ID_SETTER_TEMPERAMENT_PREV]->SetPreconfigIndex(21);
333-
m_buttons[ID_SETTER_TEMPERAMENT_NEXT]->SetPreconfigIndex(22);
334-
m_buttons[ID_SETTER_TRANSPOSE_DOWN]->SetPreconfigIndex(23);
335-
m_buttons[ID_SETTER_TRANSPOSE_UP]->SetPreconfigIndex(24);
336-
m_buttons[ID_SETTER_AUDIO_PANIC]->SetPreconfigIndex(25);
337-
m_buttons[ID_SETTER_FILE_EXIT]->SetPreconfigIndex(26);
311+
m_buttons[ID_SETTER_PREV]->SetInitialMidiIndex(0);
312+
m_buttons[ID_SETTER_NEXT]->SetInitialMidiIndex(1);
313+
m_buttons[ID_SETTER_SET]->SetInitialMidiIndex(2);
314+
m_buttons[ID_SETTER_CURRENT]->SetInitialMidiIndex(3);
315+
m_buttons[ID_SETTER_GC]->SetInitialMidiIndex(4);
316+
m_buttons[ID_SETTER_M10]->SetInitialMidiIndex(5);
317+
m_buttons[ID_SETTER_P10]->SetInitialMidiIndex(6);
318+
m_buttons[ID_SETTER_L0]->SetInitialMidiIndex(7);
319+
m_buttons[ID_SETTER_L1]->SetInitialMidiIndex(8);
320+
m_buttons[ID_SETTER_L2]->SetInitialMidiIndex(9);
321+
m_buttons[ID_SETTER_L3]->SetInitialMidiIndex(10);
322+
m_buttons[ID_SETTER_L4]->SetInitialMidiIndex(11);
323+
m_buttons[ID_SETTER_L5]->SetInitialMidiIndex(12);
324+
m_buttons[ID_SETTER_L6]->SetInitialMidiIndex(13);
325+
m_buttons[ID_SETTER_L7]->SetInitialMidiIndex(14);
326+
m_buttons[ID_SETTER_L8]->SetInitialMidiIndex(15);
327+
m_buttons[ID_SETTER_L9]->SetInitialMidiIndex(16);
328+
m_buttons[ID_SETTER_PITCH_M1]->SetInitialMidiIndex(17);
329+
m_buttons[ID_SETTER_PITCH_P1]->SetInitialMidiIndex(18);
330+
m_buttons[ID_SETTER_PITCH_M100]->SetInitialMidiIndex(19);
331+
m_buttons[ID_SETTER_PITCH_P100]->SetInitialMidiIndex(20);
332+
m_buttons[ID_SETTER_TEMPERAMENT_PREV]->SetInitialMidiIndex(21);
333+
m_buttons[ID_SETTER_TEMPERAMENT_NEXT]->SetInitialMidiIndex(22);
334+
m_buttons[ID_SETTER_TRANSPOSE_DOWN]->SetInitialMidiIndex(23);
335+
m_buttons[ID_SETTER_TRANSPOSE_UP]->SetInitialMidiIndex(24);
336+
m_buttons[ID_SETTER_AUDIO_PANIC]->SetInitialMidiIndex(25);
337+
m_buttons[ID_SETTER_FILE_EXIT]->SetInitialMidiIndex(26);
338338

339339
m_buttons[ID_SETTER_PREV]->SetShortcutKey(37);
340340
m_buttons[ID_SETTER_NEXT]->SetShortcutKey(39);
@@ -1174,7 +1174,7 @@ void GOSetter::Crescendo(int newpos, bool force) {
11741174

11751175
void GOSetter::ControlChanged(GOControl *control) {
11761176
if (control == &m_CrescendoCtrl)
1177-
Crescendo(m_CrescendoCtrl.GetMidiValue() * CRESCENDO_STEPS / 128);
1177+
Crescendo(m_CrescendoCtrl.GetEnclosureValue() * CRESCENDO_STEPS / 128);
11781178
}
11791179

11801180
void GOSetter::UpdateTranspose() {

‎src/grandorgue/combinations/control/GODivisionalButtonControl.cpp

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright 2006 Milan Digital Audio LLC
3-
* Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
3+
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
44
* License GPL-2.0 or later
55
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
66
*/
@@ -12,25 +12,17 @@
1212
#include "model/GOManual.h"
1313
#include "model/GOOrganModel.h"
1414

15+
static const wxString WX_MIDI_TYPE_CODE = wxT("Divisional");
16+
static const wxString WX_MIDI_TYPE_NAME = _("Divisional");
17+
1518
GODivisionalButtonControl::GODivisionalButtonControl(
1619
GOOrganModel &organModel, unsigned manualNumber, unsigned divisionalIndex)
17-
: GOPushbuttonControl(organModel),
20+
: GOPushbuttonControl(organModel, WX_MIDI_TYPE_CODE, WX_MIDI_TYPE_NAME),
1821
r_OrganModel(organModel),
1922
m_ManualN(manualNumber),
2023
m_DivisionalIndex(divisionalIndex),
2124
m_combination(organModel, manualNumber, false) {}
2225

23-
const wxString WX_MIDI_TYPE_CODE = wxT("Divisional");
24-
const wxString WX_MIDI_TYPE = _("Divisional");
25-
26-
const wxString &GODivisionalButtonControl::GetMidiTypeCode() const {
27-
return WX_MIDI_TYPE_CODE;
28-
}
29-
30-
const wxString &GODivisionalButtonControl::GetMidiType() const {
31-
return WX_MIDI_TYPE;
32-
}
33-
3426
void GODivisionalButtonControl::Init(
3527
GOConfigReader &cfg, const wxString &group, const wxString &name) {
3628
GOPushbuttonControl::Init(cfg, group, name);

‎src/grandorgue/combinations/control/GODivisionalButtonControl.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright 2006 Milan Digital Audio LLC
3-
* Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
3+
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
44
* License GPL-2.0 or later
55
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
66
*/
@@ -36,8 +36,6 @@ class GODivisionalButtonControl : public GOPushbuttonControl {
3636
GOOrganModel &organModel, unsigned manualNumber, unsigned divisionalIndex);
3737

3838
GODivisionalCombination &GetCombination() { return m_combination; }
39-
const wxString &GetMidiTypeCode() const override;
40-
const wxString &GetMidiType() const override;
4139

4240
void Init(GOConfigReader &cfg, const wxString &group, const wxString &name);
4341

‎src/grandorgue/combinations/control/GOGeneralButtonControl.cpp

+6-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright 2006 Milan Digital Audio LLC
3-
* Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
3+
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
44
* License GPL-2.0 or later
55
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
66
*/
@@ -12,13 +12,16 @@
1212
#include "combinations/model/GOCombinationDefinition.h"
1313
#include "model/GOOrganModel.h"
1414

15+
static const wxString WX_MIDI_TYPE_CODE = wxT("General");
16+
static const wxString WX_MIDI_TYPE_NAME = _("General");
17+
1518
GOGeneralButtonControl::GOGeneralButtonControl(
1619
GOOrganModel &organModel, bool is_setter)
17-
: GOPushbuttonControl(organModel),
20+
: GOPushbuttonControl(organModel, WX_MIDI_TYPE_CODE, WX_MIDI_TYPE_NAME),
1821
r_OrganModel(organModel),
1922
m_combination(r_OrganModel, is_setter) {}
2023

21-
void GOGeneralButtonControl::Load(GOConfigReader &cfg, wxString group) {
24+
void GOGeneralButtonControl::Load(GOConfigReader &cfg, const wxString &group) {
2225
m_combination.Load(cfg, group);
2326
GOPushbuttonControl::Load(cfg, group);
2427
}
@@ -30,14 +33,3 @@ void GOGeneralButtonControl::Push() {
3033
GOGeneralCombination &GOGeneralButtonControl::GetCombination() {
3134
return m_combination;
3235
}
33-
34-
const wxString WX_MIDI_TYPE_CODE = wxT("General");
35-
const wxString WX_MIDI_TYPE = _("General");
36-
37-
const wxString &GOGeneralButtonControl::GetMidiTypeCode() const {
38-
return WX_MIDI_TYPE_CODE;
39-
}
40-
41-
const wxString &GOGeneralButtonControl::GetMidiType() const {
42-
return WX_MIDI_TYPE;
43-
}

‎src/grandorgue/combinations/control/GOGeneralButtonControl.h

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright 2006 Milan Digital Audio LLC
3-
* Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
3+
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
44
* License GPL-2.0 or later
55
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
66
*/
@@ -21,12 +21,9 @@ class GOGeneralButtonControl : public GOPushbuttonControl {
2121

2222
public:
2323
GOGeneralButtonControl(GOOrganModel &organModel, bool is_setter);
24-
void Load(GOConfigReader &cfg, wxString group);
24+
void Load(GOConfigReader &cfg, const wxString &group) override;
2525
void Push() override;
2626
GOGeneralCombination &GetCombination();
27-
28-
const wxString &GetMidiTypeCode() const override;
29-
const wxString &GetMidiType() const override;
3027
};
3128

3229
#endif /* GOGENERAL_H */

0 commit comments

Comments
 (0)