Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed GOSetter::m_swell to m_CrescendoCtrl #2014

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Renamed GOSetter::m_swell to m_CrescendoCtrl #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8989a9
Renamed GOSetter::m_swell to m_CrescendoEnclosure
oleg68 Sep 28, 2024
9fe3c7a
Renamed m_CrescendoEnclosure to m_CrescendoCtrl
oleg68 Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/grandorgue/combinations/GOSetter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ GOSetter::GOSetter(GOOrganController *organController)
m_CrescendoDisplay(organController),
m_TransposeDisplay(organController),
m_NameDisplay(organController),
m_swell(*organController) {
m_CrescendoCtrl(*organController) {
CreateButtons(*m_OrganController);

m_buttons[ID_SETTER_PREV]->SetPreconfigIndex(0);
Expand Down Expand Up @@ -459,7 +459,7 @@ void GOSetter::Load(GOConfigReader &cfg) {
m_buttons[ID_SETTER_FILE_EXIT]->Init(
cfg, wxT("ExitGO"), _("Exit GrandOrgue"));

m_swell.Init(cfg, wxT("SetterSwell"), _("Crescendo"), 0);
m_CrescendoCtrl.Init(cfg, wxT("SetterSwell"), _("Crescendo"), 0);

m_PosDisplay.Init(cfg, wxT("SetterCurrentPosition"), _("sequencer position"));
m_BankDisplay.Init(cfg, wxT("SetterGeneralBank"), _("general bank"));
Expand Down Expand Up @@ -1161,8 +1161,8 @@ void GOSetter::Crescendo(int newpos, bool force) {
}

void GOSetter::ControlChanged(GOControl *control) {
if (control == &m_swell)
Crescendo(m_swell.GetValue() * CRESCENDO_STEPS / 128);
if (control == &m_CrescendoCtrl)
Crescendo(m_CrescendoCtrl.GetValue() * CRESCENDO_STEPS / 128);
}

void GOSetter::UpdateTranspose() {
Expand All @@ -1188,7 +1188,7 @@ void GOSetter::UpdateModified(bool modified) {

GOEnclosure *GOSetter::GetEnclosure(const wxString &name, bool is_panel) {
if (name == wxT("Swell"))
return &m_swell;
return &m_CrescendoCtrl;

return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion src/grandorgue/combinations/GOSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class GOSetter : private GOSoundStateHandler,
GOLabelControl m_CrescendoDisplay;
GOLabelControl m_TransposeDisplay;
GOLabelControl m_NameDisplay;
GOEnclosure m_swell;
GOEnclosure m_CrescendoCtrl;

// Show the combination file name
void DisplayCmbFile(const wxString &fileName);
Expand Down
Loading