From dfe40f631e336e6d1b1530a21a8f53708bd1a35e Mon Sep 17 00:00:00 2001 From: Oleg Samarin Date: Tue, 21 Jan 2025 20:41:58 +0300 Subject: [PATCH] Renamed SetReceiverIndex to SetMidiReceiverIndex --- src/grandorgue/GOMetronome.cpp | 10 ++-- src/grandorgue/combinations/GOSetter.cpp | 54 +++++++++---------- .../objects/GOMidiReceivingSendingObject.h | 2 +- src/grandorgue/model/GOEnclosure.cpp | 3 +- src/grandorgue/model/GOManual.cpp | 2 +- 5 files changed, 35 insertions(+), 36 deletions(-) diff --git a/src/grandorgue/GOMetronome.cpp b/src/grandorgue/GOMetronome.cpp index 310168c14..8c1414e1f 100644 --- a/src/grandorgue/GOMetronome.cpp +++ b/src/grandorgue/GOMetronome.cpp @@ -59,11 +59,11 @@ GOMetronome::GOMetronome(GOOrganController *organController) m_StopID(0) { CreateButtons(*m_OrganController); - m_buttons[ID_METRONOME_ON]->SetReceiverIndex(25); - m_buttons[ID_METRONOME_MEASURE_P1]->SetReceiverIndex(28); - m_buttons[ID_METRONOME_MEASURE_M1]->SetReceiverIndex(29); - m_buttons[ID_METRONOME_BEAT_P1]->SetReceiverIndex(26); - m_buttons[ID_METRONOME_BEAT_M1]->SetReceiverIndex(27); + m_buttons[ID_METRONOME_ON]->SetMidiReceiverIndex(25); + m_buttons[ID_METRONOME_MEASURE_P1]->SetMidiReceiverIndex(28); + m_buttons[ID_METRONOME_MEASURE_M1]->SetMidiReceiverIndex(29); + m_buttons[ID_METRONOME_BEAT_P1]->SetMidiReceiverIndex(26); + m_buttons[ID_METRONOME_BEAT_M1]->SetMidiReceiverIndex(27); m_OrganController->RegisterSoundStateHandler(this); } diff --git a/src/grandorgue/combinations/GOSetter.cpp b/src/grandorgue/combinations/GOSetter.cpp index e154f9f83..62733a70d 100644 --- a/src/grandorgue/combinations/GOSetter.cpp +++ b/src/grandorgue/combinations/GOSetter.cpp @@ -308,33 +308,33 @@ GOSetter::GOSetter(GOOrganController *organController) m_CrescendoCtrl(*organController) { CreateButtons(*m_OrganController); - m_buttons[ID_SETTER_PREV]->SetReceiverIndex(0); - m_buttons[ID_SETTER_NEXT]->SetReceiverIndex(1); - m_buttons[ID_SETTER_SET]->SetReceiverIndex(2); - m_buttons[ID_SETTER_CURRENT]->SetReceiverIndex(3); - m_buttons[ID_SETTER_GC]->SetReceiverIndex(4); - m_buttons[ID_SETTER_M10]->SetReceiverIndex(5); - m_buttons[ID_SETTER_P10]->SetReceiverIndex(6); - m_buttons[ID_SETTER_L0]->SetReceiverIndex(7); - m_buttons[ID_SETTER_L1]->SetReceiverIndex(8); - m_buttons[ID_SETTER_L2]->SetReceiverIndex(9); - m_buttons[ID_SETTER_L3]->SetReceiverIndex(10); - m_buttons[ID_SETTER_L4]->SetReceiverIndex(11); - m_buttons[ID_SETTER_L5]->SetReceiverIndex(12); - m_buttons[ID_SETTER_L6]->SetReceiverIndex(13); - m_buttons[ID_SETTER_L7]->SetReceiverIndex(14); - m_buttons[ID_SETTER_L8]->SetReceiverIndex(15); - m_buttons[ID_SETTER_L9]->SetReceiverIndex(16); - m_buttons[ID_SETTER_PITCH_M1]->SetReceiverIndex(17); - m_buttons[ID_SETTER_PITCH_P1]->SetReceiverIndex(18); - m_buttons[ID_SETTER_PITCH_M100]->SetReceiverIndex(19); - m_buttons[ID_SETTER_PITCH_P100]->SetReceiverIndex(20); - m_buttons[ID_SETTER_TEMPERAMENT_PREV]->SetReceiverIndex(21); - m_buttons[ID_SETTER_TEMPERAMENT_NEXT]->SetReceiverIndex(22); - m_buttons[ID_SETTER_TRANSPOSE_DOWN]->SetReceiverIndex(23); - m_buttons[ID_SETTER_TRANSPOSE_UP]->SetReceiverIndex(24); - m_buttons[ID_SETTER_AUDIO_PANIC]->SetReceiverIndex(25); - m_buttons[ID_SETTER_FILE_EXIT]->SetReceiverIndex(26); + m_buttons[ID_SETTER_PREV]->SetMidiReceiverIndex(0); + m_buttons[ID_SETTER_NEXT]->SetMidiReceiverIndex(1); + m_buttons[ID_SETTER_SET]->SetMidiReceiverIndex(2); + m_buttons[ID_SETTER_CURRENT]->SetMidiReceiverIndex(3); + m_buttons[ID_SETTER_GC]->SetMidiReceiverIndex(4); + m_buttons[ID_SETTER_M10]->SetMidiReceiverIndex(5); + m_buttons[ID_SETTER_P10]->SetMidiReceiverIndex(6); + m_buttons[ID_SETTER_L0]->SetMidiReceiverIndex(7); + m_buttons[ID_SETTER_L1]->SetMidiReceiverIndex(8); + m_buttons[ID_SETTER_L2]->SetMidiReceiverIndex(9); + m_buttons[ID_SETTER_L3]->SetMidiReceiverIndex(10); + m_buttons[ID_SETTER_L4]->SetMidiReceiverIndex(11); + m_buttons[ID_SETTER_L5]->SetMidiReceiverIndex(12); + m_buttons[ID_SETTER_L6]->SetMidiReceiverIndex(13); + m_buttons[ID_SETTER_L7]->SetMidiReceiverIndex(14); + m_buttons[ID_SETTER_L8]->SetMidiReceiverIndex(15); + m_buttons[ID_SETTER_L9]->SetMidiReceiverIndex(16); + m_buttons[ID_SETTER_PITCH_M1]->SetMidiReceiverIndex(17); + m_buttons[ID_SETTER_PITCH_P1]->SetMidiReceiverIndex(18); + m_buttons[ID_SETTER_PITCH_M100]->SetMidiReceiverIndex(19); + m_buttons[ID_SETTER_PITCH_P100]->SetMidiReceiverIndex(20); + m_buttons[ID_SETTER_TEMPERAMENT_PREV]->SetMidiReceiverIndex(21); + m_buttons[ID_SETTER_TEMPERAMENT_NEXT]->SetMidiReceiverIndex(22); + m_buttons[ID_SETTER_TRANSPOSE_DOWN]->SetMidiReceiverIndex(23); + m_buttons[ID_SETTER_TRANSPOSE_UP]->SetMidiReceiverIndex(24); + m_buttons[ID_SETTER_AUDIO_PANIC]->SetMidiReceiverIndex(25); + m_buttons[ID_SETTER_FILE_EXIT]->SetMidiReceiverIndex(26); m_buttons[ID_SETTER_PREV]->SetShortcutKey(37); m_buttons[ID_SETTER_NEXT]->SetShortcutKey(39); diff --git a/src/grandorgue/midi/objects/GOMidiReceivingSendingObject.h b/src/grandorgue/midi/objects/GOMidiReceivingSendingObject.h index 28ec28a8a..cce11b3bf 100644 --- a/src/grandorgue/midi/objects/GOMidiReceivingSendingObject.h +++ b/src/grandorgue/midi/objects/GOMidiReceivingSendingObject.h @@ -51,7 +51,7 @@ class GOMidiReceivingSendingObject : public GOMidiSendingObject, public: virtual void SetElementId(int id) override; - void SetReceiverIndex(unsigned index) { m_receiver.SetIndex(index); } + void SetMidiReceiverIndex(unsigned index) { m_receiver.SetIndex(index); } }; #endif /* GOMIDIRECEIVINGSENDINGOBJECT_H */ diff --git a/src/grandorgue/model/GOEnclosure.cpp b/src/grandorgue/model/GOEnclosure.cpp index be6a01158..4d2c2516c 100644 --- a/src/grandorgue/model/GOEnclosure.cpp +++ b/src/grandorgue/model/GOEnclosure.cpp @@ -32,7 +32,6 @@ GOEnclosure::GOEnclosure(GOOrganModel &organModel) m_AmpMinimumLevel(0), m_MIDIValue(0) {} - static const wxString WX_AMP_MINIMUM_LEVEL = wxT("AmpMinimumLevel"); static const wxString WX_VALUE = wxT("Value"); @@ -72,7 +71,7 @@ void GOEnclosure::Load( m_MIDIInputNumber = cfg.ReadInteger( ODFSetting, m_group, wxT("MIDIInputNumber"), 0, 200, false, 0); LoadFromCmb(cfg, MAX_MIDI_VALUE); - SetReceiverIndex(enclosureNb); + SetMidiReceiverIndex(enclosureNb); } void GOEnclosure::Save(GOConfigWriter &cfg) { diff --git a/src/grandorgue/model/GOManual.cpp b/src/grandorgue/model/GOManual.cpp index 9b2b8c439..c6ebd931b 100644 --- a/src/grandorgue/model/GOManual.cpp +++ b/src/grandorgue/model/GOManual.cpp @@ -153,7 +153,7 @@ void GOManual::Load( false); m_manual_number = manualNumber; - SetReceiverIndex(manualNumber); + SetMidiReceiverIndex(manualNumber); for (unsigned i = 0; i < GOMidiReceiver::KEY_MAP_SIZE; i++) m_MidiKeyMap[i] = (uint8_t)cfg.ReadInteger(