Skip to content

Commit 40411b5

Browse files
oleg68oleg68
authored
Renamed and moved midi/GOMidiConfigurator to midi/objects/GOMidiObject (#2093)
1 parent ad1f890 commit 40411b5

17 files changed

+5470
-5269
lines changed

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

+5,415-5,214
Large diffs are not rendered by default.

‎src/grandorgue/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright 2006 Milan Digital Audio LLC
2-
# Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
2+
# Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
33
# License GPL-2.0 or later (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
44

55
include(${CMAKE_SOURCE_DIR}/cmake/AddLinkerOption.cmake)
@@ -147,7 +147,6 @@ midi/ports/GOMidiRtPortFactory.cpp
147147
midi/ports/GOMidiRtInPort.cpp
148148
midi/ports/GOMidiRtOutPort.cpp
149149
midi/GOMidi.cpp
150-
midi/GOMidiConfigurator.cpp
151150
midi/GOMidiInputMerger.cpp
152151
midi/GOMidiListener.cpp
153152
midi/GOMidiOutputMerger.cpp
@@ -159,6 +158,7 @@ midi/GOMidiShortcutPattern.cpp
159158
midi/GOMidiShortcutReceiver.cpp
160159
midi/GOMidiReceiver.cpp
161160
midi/GOMidiRecorder.cpp
161+
midi/objects/GOMidiObject.cpp
162162
model/pipe-config/GOPipeConfig.cpp
163163
model/pipe-config/GOPipeConfigNode.cpp
164164
model/pipe-config/GOPipeConfigTreeNode.cpp

‎src/grandorgue/control/GOButtonControl.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
*/
@@ -19,7 +19,7 @@ GOButtonControl::GOButtonControl(
1919
GOMidiReceiverType midi_type,
2020
bool pushbutton,
2121
bool isPiston)
22-
: GOMidiConfigurator(organModel),
22+
: GOMidiObject(organModel),
2323
r_MidiMap(organModel.GetConfig().GetMidiMap()),
2424
r_OrganModel(organModel),
2525
m_midi(organModel, midi_type),

‎src/grandorgue/control/GOButtonControl.h

+3-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
*/
@@ -10,10 +10,10 @@
1010

1111
#include <wx/string.h>
1212

13-
#include "midi/GOMidiConfigurator.h"
1413
#include "midi/GOMidiReceiver.h"
1514
#include "midi/GOMidiSender.h"
1615
#include "midi/GOMidiShortcutReceiver.h"
16+
#include "midi/objects/GOMidiObject.h"
1717
#include "sound/GOSoundStateHandler.h"
1818

1919
#include "GOControl.h"
@@ -30,7 +30,7 @@ class GOButtonControl : public GOControl,
3030
private GOEventHandler,
3131
public GOSaveableObject,
3232
public GOSoundStateHandler,
33-
public GOMidiConfigurator {
33+
public GOMidiObject {
3434
private:
3535
GOMidiMap &r_MidiMap;
3636

‎src/grandorgue/control/GOLabelControl.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-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
*/
@@ -14,7 +14,7 @@
1414
#include "config/GOConfig.h"
1515

1616
GOLabelControl::GOLabelControl(GOOrganController *organController)
17-
: GOMidiConfigurator(*organController),
17+
: GOMidiObject(*organController),
1818
m_Name(),
1919
m_Content(),
2020
m_OrganController(organController),

‎src/grandorgue/control/GOLabelControl.h

+3-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
*/
@@ -10,8 +10,8 @@
1010

1111
#include <wx/string.h>
1212

13-
#include "midi/GOMidiConfigurator.h"
1413
#include "midi/GOMidiSender.h"
14+
#include "midi/objects/GOMidiObject.h"
1515
#include "sound/GOSoundStateHandler.h"
1616

1717
#include "GOControl.h"
@@ -24,7 +24,7 @@ class GOOrganController;
2424
class GOLabelControl : public GOControl,
2525
private GOSaveableObject,
2626
private GOSoundStateHandler,
27-
public GOMidiConfigurator {
27+
public GOMidiObject {
2828
protected:
2929
wxString m_Name;
3030
wxString m_Content;

‎src/grandorgue/gui/dialogs/GOMidiListDialog.cpp

+12-12
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
*/
@@ -11,7 +11,7 @@
1111
#include <wx/listctrl.h>
1212
#include <wx/sizer.h>
1313

14-
#include "midi/GOMidiConfigurator.h"
14+
#include "midi/objects/GOMidiObject.h"
1515

1616
#include "GOEvent.h"
1717

@@ -28,7 +28,7 @@ GOMidiListDialog::GOMidiListDialog(
2828
GODocumentBase *doc,
2929
wxWindow *parent,
3030
GODialogSizeSet &dialogSizes,
31-
const std::vector<GOMidiConfigurator *> &midi_elements)
31+
const std::vector<GOMidiObject *> &midi_elements)
3232
: GOSimpleDialog(
3333
parent,
3434
wxT("MIDI Objects"),
@@ -70,7 +70,7 @@ GOMidiListDialog::GOMidiListDialog(
7070
topSizer->Add(buttons, 0, wxALIGN_RIGHT | wxALL, 1);
7171

7272
for (unsigned i = 0; i < midi_elements.size(); i++) {
73-
GOMidiConfigurator *obj = midi_elements[i];
73+
GOMidiObject *obj = midi_elements[i];
7474

7575
m_Objects->InsertItem(i, obj->GetMidiType());
7676
m_Objects->SetItemPtrData(i, (wxUIntPtr)obj);
@@ -87,14 +87,14 @@ GOMidiListDialog::GOMidiListDialog(
8787
GOMidiListDialog::~GOMidiListDialog() {}
8888

8989
void GOMidiListDialog::OnButton(wxCommandEvent &event) {
90-
GOMidiConfigurator *obj = (GOMidiConfigurator *)m_Objects->GetItemData(
91-
m_Objects->GetFirstSelected());
90+
GOMidiObject *obj
91+
= (GOMidiObject *)m_Objects->GetItemData(m_Objects->GetFirstSelected());
9292
obj->TriggerElementActions(event.GetId() - ID_BUTTON);
9393
}
9494

9595
void GOMidiListDialog::OnStatus(wxCommandEvent &event) {
96-
GOMidiConfigurator *obj = (GOMidiConfigurator *)m_Objects->GetItemData(
97-
m_Objects->GetFirstSelected());
96+
GOMidiObject *obj
97+
= (GOMidiObject *)m_Objects->GetItemData(m_Objects->GetFirstSelected());
9898
wxString status = obj->GetElementStatus();
9999
GOMessageBox(
100100
wxString::Format(_("Status: %s"), status),
@@ -105,8 +105,8 @@ void GOMidiListDialog::OnStatus(wxCommandEvent &event) {
105105
void GOMidiListDialog::OnObjectClick(wxListEvent &event) {
106106
m_Edit->Enable();
107107
m_Status->Enable();
108-
GOMidiConfigurator *obj = (GOMidiConfigurator *)m_Objects->GetItemData(
109-
m_Objects->GetFirstSelected());
108+
GOMidiObject *obj
109+
= (GOMidiObject *)m_Objects->GetItemData(m_Objects->GetFirstSelected());
110110
std::vector<wxString> actions = obj->GetElementActions();
111111
for (unsigned i = 0; i < m_Buttons.size(); i++)
112112
if (i < actions.size()) {
@@ -118,8 +118,8 @@ void GOMidiListDialog::OnObjectClick(wxListEvent &event) {
118118
}
119119

120120
void GOMidiListDialog::OnObjectDoubleClick(wxListEvent &event) {
121-
GOMidiConfigurator *obj = (GOMidiConfigurator *)m_Objects->GetItemData(
122-
m_Objects->GetFirstSelected());
121+
GOMidiObject *obj
122+
= (GOMidiObject *)m_Objects->GetItemData(m_Objects->GetFirstSelected());
123123
obj->ShowConfigDialog();
124124
}
125125

‎src/grandorgue/gui/dialogs/GOMidiListDialog.h

+3-3
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
*/
@@ -17,7 +17,7 @@ class wxButton;
1717
class wxListEvent;
1818
class wxListView;
1919

20-
class GOMidiConfigurator;
20+
class GOMidiObject;
2121

2222
class GOMidiListDialog : public GOSimpleDialog, public GOView {
2323
private:
@@ -45,7 +45,7 @@ class GOMidiListDialog : public GOSimpleDialog, public GOView {
4545
GODocumentBase *doc,
4646
wxWindow *parent,
4747
GODialogSizeSet &dialogSizes,
48-
const std::vector<GOMidiConfigurator *> &midi_elements);
48+
const std::vector<GOMidiObject *> &midi_elements);
4949
~GOMidiListDialog();
5050

5151
DECLARE_EVENT_TABLE()

‎src/grandorgue/midi/GOMidiConfigurator.cpp ‎src/grandorgue/midi/objects/GOMidiObject.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
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
*/
77

8-
#include "GOMidiConfigurator.h"
8+
#include "GOMidiObject.h"
99

1010
#include <wx/intl.h>
1111

12-
#include "dialog-creator/GOMidiDialogCreator.h"
12+
#include "midi/dialog-creator/GOMidiDialogCreator.h"
1313

14-
void GOMidiConfigurator::ShowConfigDialog() {
14+
void GOMidiObject::ShowConfigDialog() {
1515
const wxString &midiTypeCode = GetMidiTypeCode();
1616
const wxString &midiName = GetMidiName();
1717
wxString title

‎src/grandorgue/midi/GOMidiConfigurator.h ‎src/grandorgue/midi/objects/GOMidiObject.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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
*/
77

8-
#ifndef GOMIDICONFIGURATOR_H
9-
#define GOMIDICONFIGURATOR_H
8+
#ifndef GOMIDIOBJECT_H
9+
#define GOMIDIOBJECT_H
1010

1111
#include <wx/string.h>
1212

@@ -17,7 +17,7 @@ class GOMidiReceiverBase;
1717
class GOMidiSender;
1818
class GOMidiShortcutReceiver;
1919

20-
class GOMidiConfigurator {
20+
class GOMidiObject {
2121
private:
2222
GOMidiDialogCreator &r_DialogCreator;
2323

@@ -28,10 +28,10 @@ class GOMidiConfigurator {
2828
virtual GOMidiSender *GetDivision() { return nullptr; }
2929

3030
public:
31-
GOMidiConfigurator(GOMidiDialogCreator &dialogCreator)
31+
GOMidiObject(GOMidiDialogCreator &dialogCreator)
3232
: r_DialogCreator(dialogCreator) {}
3333

34-
virtual ~GOMidiConfigurator() {}
34+
virtual ~GOMidiObject() {}
3535

3636
virtual const wxString &GetMidiTypeCode() const = 0;
3737
virtual const wxString &GetMidiType() const = 0;

‎src/grandorgue/model/GOEnclosure.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "GOOrganModel.h"
1717

1818
GOEnclosure::GOEnclosure(GOOrganModel &organModel)
19-
: GOMidiConfigurator(organModel),
19+
: GOMidiObject(organModel),
2020
r_OrganModel(organModel),
2121
r_MidiMap(organModel.GetConfig().GetMidiMap()),
2222
m_midi(organModel, MIDI_RECV_ENCLOSURE),

‎src/grandorgue/model/GOEnclosure.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#include <wx/string.h>
1515

1616
#include "control/GOControl.h"
17-
#include "midi/GOMidiConfigurator.h"
1817
#include "midi/GOMidiReceiver.h"
1918
#include "midi/GOMidiSender.h"
2019
#include "midi/GOMidiShortcutReceiver.h"
20+
#include "midi/objects/GOMidiObject.h"
2121
#include "sound/GOSoundStateHandler.h"
2222

2323
#include "GOEventHandler.h"
@@ -33,7 +33,7 @@ class GOEnclosure : public GOControl,
3333
private GOEventHandler,
3434
private GOSaveableObject,
3535
private GOSoundStateHandler,
36-
public GOMidiConfigurator {
36+
public GOMidiObject {
3737
private:
3838
GOOrganModel &r_OrganModel;
3939
GOMidiMap &r_MidiMap;

‎src/grandorgue/model/GOEventHandlerList.h

+5-5
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
*/
@@ -17,7 +17,7 @@ class GOCombinationButtonSet;
1717
class GOControl;
1818
class GOControlChangedHandler;
1919
class GOEventHandler;
20-
class GOMidiConfigurator;
20+
class GOMidiObject;
2121
class GOReferencingObject;
2222
class GOSoundStateHandler;
2323
class GOSaveableObject;
@@ -61,7 +61,7 @@ class GOEventHandlerList {
6161
UPVector<GOReferencingObject> m_ReferencingObjects;
6262
UPVector<GOCombinationButtonSet> m_CombinationButtonSets;
6363
UPVector<GOControlChangedHandler> m_ControlChangedHandlers;
64-
UPVector<GOMidiConfigurator> m_MidiConfigurators;
64+
UPVector<GOMidiObject> m_MidiConfigurators;
6565
UPVector<GOEventHandler> m_MidiEventHandlers;
6666
UPVector<GOSoundStateHandler> m_SoundStateHandlers;
6767
UPVector<GOSaveableObject> m_SaveableObjects;
@@ -77,7 +77,7 @@ class GOEventHandlerList {
7777
const {
7878
return m_CombinationButtonSets.AsVector();
7979
}
80-
const std::vector<GOMidiConfigurator *> &GetMidiConfigurators() const {
80+
const std::vector<GOMidiObject *> &GetMidiConfigurators() const {
8181
return m_MidiConfigurators.AsVector();
8282
}
8383
const std::vector<GOEventHandler *> &GetMidiEventHandlers() const {
@@ -112,7 +112,7 @@ class GOEventHandlerList {
112112
m_ControlChangedHandlers.Remove(handler);
113113
}
114114

115-
void RegisterMidiConfigurator(GOMidiConfigurator *obj) {
115+
void RegisterMidiConfigurator(GOMidiObject *obj) {
116116
m_MidiConfigurators.Add(obj);
117117
}
118118

‎src/grandorgue/model/GOManual.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
*/
@@ -21,7 +21,7 @@
2121
#include "GOTremulant.h"
2222

2323
GOManual::GOManual(GOOrganModel &organModel)
24-
: GOMidiConfigurator(organModel),
24+
: GOMidiObject(organModel),
2525
r_OrganModel(organModel),
2626
r_MidiMap(organModel.GetConfig().GetMidiMap()),
2727
m_group(wxT("---")),

‎src/grandorgue/model/GOManual.h

+3-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
*/
@@ -15,9 +15,9 @@
1515
#include "combinations/control/GOCombinationButtonSet.h"
1616
#include "combinations/model/GOCombinationDefinition.h"
1717
#include "control/GOControl.h"
18-
#include "midi/GOMidiConfigurator.h"
1918
#include "midi/GOMidiReceiver.h"
2019
#include "midi/GOMidiSender.h"
20+
#include "midi/objects/GOMidiObject.h"
2121
#include "sound/GOSoundStateHandler.h"
2222

2323
#include "GOEventHandler.h"
@@ -38,7 +38,7 @@ class GOManual : public GOControl,
3838
private GOCombinationButtonSet,
3939
private GOSaveableObject,
4040
private GOSoundStateHandler,
41-
public GOMidiConfigurator {
41+
public GOMidiObject {
4242
private:
4343
GOOrganModel &r_OrganModel;
4444
GOMidiMap &r_MidiMap;

0 commit comments

Comments
 (0)