Intermediate commit 5

src/core/GOSetterButtonCallback.h

@@ -8,13 +8,13 @@
 #ifndef GOSETTERBUTTONCALLBACK_H
 #define GOSETTERBUTTONCALLBACK_H
 
-class GOSetterButton;
+class GOSetterButtonControl;
 
 class GOSetterButtonCallback {
 public:
   virtual ~GOSetterButtonCallback() {}
 
-  virtual void SetterButtonChanged(GOSetterButton *button) = 0;
+  virtual void SetterButtonChanged(GOSetterButtonControl *button) = 0;
 };
 
 #endif

src/grandorgue/CMakeLists.txt

@@ -26,9 +26,9 @@ include_directories(${JACK_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set(grandorgue_src
-combinations/gui/GODivisionalButton.cpp
-combinations/gui/GOGeneralButton.cpp
-combinations/gui/GOSetterButton.cpp
+combinations/control/GODivisionalButtonControl.cpp
+combinations/control/GOGeneralButtonControl.cpp
+combinations/control/GOSetterButtonControl.cpp
 combinations/model/GOCombination.cpp
 combinations/model/GOGeneralCombination.cpp
 combinations/GOCombinationDefinition.cpp
@@ -38,6 +38,9 @@ config/GOMidiDeviceConfig.cpp
 config/GOMidiDeviceConfigList.cpp
 config/GOPortsConfig.cpp
 config/GOPortFactory.cpp
+control/GOButtonControl.cpp
+control/GOPistonControl.cpp
+control/GOPushbuttonControl.cpp
 dialogs/common/GODialogCloser.cpp
 dialogs/common/GODialogTab.cpp
 dialogs/common/GOTabbedDialog.cpp
@@ -137,7 +140,6 @@ GOCacheCleaner.cpp
 GOCacheWriter.cpp
 GOBitmap.cpp
 GOBitmapCache.cpp
-GOButton.cpp
 GOCoupler.cpp
 GODC.cpp
 GODivisionalCoupler.cpp
@@ -160,9 +162,7 @@ GOPipe.cpp
 GOPipeConfig.cpp
 GOPipeConfigNode.cpp
 GOPipeConfigTreeNode.cpp
-GOPiston.cpp
 GOProperties.cpp
-GOPushbutton.cpp
 GORank.cpp
 GOReferencePipe.cpp
 GOReleaseAlignTable.cpp

src/grandorgue/GOAudioRecorder.cpp

@@ -10,7 +10,7 @@
 #include <wx/filename.h>
 #include <wx/intl.h>
 
-#include "combinations/gui/GOSetterButton.h"
+#include "combinations/control/GOSetterButtonControl.h"
 #include "config/GOConfig.h"
 #include "sound/GOSoundRecorder.h"
 

src/grandorgue/GODefinitionFile.cpp

@@ -18,15 +18,16 @@
 #include "archive/GOArchiveFile.h"
 #include "archive/GOArchiveManager.h"
 #include "combinations/GOSetter.h"
-#include "combinations/gui/GODivisionalButton.h"
-#include "combinations/gui/GOGeneralButton.h"
+#include "combinations/control/GODivisionalButtonControl.h"
+#include "combinations/control/GOGeneralButtonControl.h"
 #include "config/GOConfig.h"
 #include "config/GOConfigFileReader.h"
 #include "config/GOConfigFileWriter.h"
 #include "config/GOConfigReader.h"
 #include "config/GOConfigReaderDB.h"
 #include "config/GOConfigWriter.h"
 #include "contrib/sha1.h"
+#include "control/GOPushbuttonControl.h"
 #include "dialogs/GOProgressDialog.h"
 #include "files/GOStdFileName.h"
 #include "gui/GOGUIBankedGeneralsPanel.h"
@@ -65,7 +66,6 @@
 #include "GOMetronome.h"
 #include "GOOrgan.h"
 #include "GOPath.h"
-#include "GOPushbutton.h"
 #include "GORank.h"
 #include "GOReleaseAlignTable.h"
 #include "GOSoundingPipe.h"
@@ -790,9 +790,10 @@ GOLabel *GODefinitionFile::GetLabel(const wxString &name, bool is_panel) {
   return NULL;
 }
 
-GOButton *GODefinitionFile::GetButton(const wxString &name, bool is_panel) {
+GOButtonControl *GODefinitionFile::GetButton(
+  const wxString &name, bool is_panel) {
   for (unsigned i = 0; i < m_elementcreators.size(); i++) {
-    GOButton *c = m_elementcreators[i]->GetButton(name, is_panel);
+    GOButtonControl *c = m_elementcreators[i]->GetButton(name, is_panel);
     if (c)
       return c;
   }

src/grandorgue/GODefinitionFile.h

@@ -30,7 +30,7 @@ class GOGUIPanel;
 class GOGUIPanelCreator;
 class GOArchive;
 class GOAudioRecorder;
-class GOButton;
+class GOButtonControl;
 class GOCache;
 class GOElementCreator;
 class GOMidi;
@@ -197,7 +197,7 @@ class GODefinitionFile : public GOEventDistributor,
 
   GOEnclosure *GetEnclosure(const wxString &name, bool is_panel = false);
   GOLabel *GetLabel(const wxString &name, bool is_panel = false);
-  GOButton *GetButton(const wxString &name, bool is_panel = false);
+  GOButtonControl *GetButton(const wxString &name, bool is_panel = false);
 
   /* TODO: can somebody figure out what this thing is */
   bool IsCustomized();

src/grandorgue/GODrawStop.cpp

@@ -25,7 +25,7 @@ const struct IniFileEnumEntry GODrawstop::m_function_types[] = {
 };
 
 GODrawstop::GODrawstop(GODefinitionFile *organfile)
-  : GOButton(organfile, MIDI_RECV_DRAWSTOP, false),
+  : GOButtonControl(organfile, MIDI_RECV_DRAWSTOP, false),
     m_Type(FUNCTION_INPUT),
     m_GCState(0),
     m_ActiveState(false),
@@ -45,7 +45,7 @@ void GODrawstop::Init(GOConfigReader &cfg, wxString group, wxString name) {
   m_GCState = 0;
   m_StoreDivisional = true;
   m_StoreGeneral = true;
-  GOButton::Init(cfg, group, name);
+  GOButtonControl::Init(cfg, group, name);
 }
 
 void GODrawstop::Load(GOConfigReader &cfg, wxString group) {
@@ -104,7 +104,7 @@ void GODrawstop::Load(GOConfigReader &cfg, wxString group) {
     }
   }
 
-  GOButton::Load(cfg, group);
+  GOButtonControl::Load(cfg, group);
   SetupCombinationState();
   m_StoreDivisional = cfg.ReadBoolean(
     ODFSetting, group, wxT("StoreInDivisional"), false, m_StoreDivisional);
@@ -115,7 +115,7 @@ void GODrawstop::Load(GOConfigReader &cfg, wxString group) {
 void GODrawstop::Save(GOConfigWriter &cfg) {
   if (!IsReadOnly())
     cfg.WriteBoolean(m_group, wxT("DefaultToEngaged"), IsEngaged());
-  GOButton::Save(cfg);
+  GOButtonControl::Save(cfg);
 }
 
 void GODrawstop::Set(bool on) {
@@ -155,7 +155,7 @@ void GODrawstop::SetCombination(bool on) {
 bool GODrawstop::IsActive() const { return m_ActiveState; }
 
 void GODrawstop::PreparePlayback() {
-  GOButton::PreparePlayback();
+  GOButtonControl::PreparePlayback();
   Update();
 }
 

src/grandorgue/GODrawStop.h

@@ -11,10 +11,9 @@
 #include <wx/string.h>
 
 #include "combinations/model/GOCombinationElement.h"
+#include "control/GOButtonControl.h"
 
-#include "GOButton.h"
-
-class GODrawstop : public GOButton, public GOCombinationElement {
+class GODrawstop : public GOButtonControl, public GOCombinationElement {
 public:
   typedef enum {
     FUNCTION_INPUT,

src/grandorgue/GOElementCreator.cpp

@@ -7,7 +7,7 @@
 
 #include "GOElementCreator.h"
 
-#include "combinations/gui/GOSetterButton.h"
+#include "combinations/control/GOSetterButtonControl.h"
 
 GOElementCreator::GOElementCreator() : m_button() {}
 
@@ -21,11 +21,12 @@ void GOElementCreator::CreateButtons(GODefinitionFile *organfile) {
     if (m_button.size() <= (unsigned)entries[i].value)
       m_button.resize(entries[i].value + 1);
     m_button[entries[i].value]
-      = new GOSetterButton(organfile, this, entries[i].is_pushbutton);
+      = new GOSetterButtonControl(organfile, this, entries[i].is_pushbutton);
   }
 }
 
-GOButton *GOElementCreator::GetButton(const wxString &name, bool is_panel) {
+GOButtonControl *GOElementCreator::GetButton(
+  const wxString &name, bool is_panel) {
   const struct ElementListEntry *entries = GetButtonList();
   for (unsigned i = 0;
        entries[i].name != wxEmptyString && entries[i].value >= 0;
@@ -39,7 +40,7 @@ GOButton *GOElementCreator::GetButton(const wxString &name, bool is_panel) {
   return NULL;
 }
 
-void GOElementCreator::SetterButtonChanged(GOSetterButton *button) {
+void GOElementCreator::SetterButtonChanged(GOSetterButtonControl *button) {
   for (unsigned i = 0; i < m_button.size(); i++)
     if (m_button[i] == button)
       ButtonChanged(i);

src/grandorgue/GOElementCreator.h

@@ -14,10 +14,10 @@
 #include "ptrvector.h"
 
 class GOConfigReader;
-class GOButton;
+class GOButtonControl;
 class GOEnclosure;
 class GOLabel;
-class GOSetterButton;
+class GOSetterButtonControl;
 class GODefinitionFile;
 
 struct ElementListEntry {
@@ -29,10 +29,10 @@ struct ElementListEntry {
 
 class GOElementCreator : private GOSetterButtonCallback {
 private:
-  void SetterButtonChanged(GOSetterButton *button);
+  void SetterButtonChanged(GOSetterButtonControl *button);
 
 protected:
-  ptr_vector<GOSetterButton> m_button;
+  ptr_vector<GOSetterButtonControl> m_button;
 
   virtual const struct ElementListEntry *GetButtonList() = 0;
   virtual void ButtonChanged(int id) = 0;
@@ -46,7 +46,7 @@ class GOElementCreator : private GOSetterButtonCallback {
 
   virtual GOEnclosure *GetEnclosure(const wxString &name, bool is_panel) = 0;
   virtual GOLabel *GetLabel(const wxString &name, bool is_panel) = 0;
-  virtual GOButton *GetButton(const wxString &name, bool is_panel);
+  virtual GOButtonControl *GetButton(const wxString &name, bool is_panel);
 };
 
 #endif

src/grandorgue/GOManual.cpp

@@ -9,7 +9,7 @@
 
 #include <wx/intl.h>
 
-#include "combinations/gui/GODivisionalButton.h"
+#include "combinations/control/GODivisionalButtonControl.h"
 #include "config/GOConfig.h"
 #include "config/GOConfigReader.h"
 
@@ -217,8 +217,8 @@ void GOManual::Load(GOConfigReader &cfg, wxString group, int manualNumber) {
   GetDivisionalTemplate().InitDivisional(m_manual_number);
   m_divisionals.resize(0);
   for (unsigned i = 0; i < nb_divisionals; i++) {
-    m_divisionals.push_back(
-      new GODivisionalButton(m_organfile, GetDivisionalTemplate(), false));
+    m_divisionals.push_back(new GODivisionalButtonControl(
+      m_organfile, GetDivisionalTemplate(), false));
     buffer.Printf(wxT("Divisional%03d"), i + 1);
     buffer.Printf(
       wxT("Divisional%03d"),
@@ -357,12 +357,12 @@ void GOManual::AddCoupler(GOCoupler *coupler) { m_couplers.push_back(coupler); }
 
 unsigned GOManual::GetDivisionalCount() { return m_divisionals.size(); }
 
-GODivisionalButton *GOManual::GetDivisional(unsigned index) {
+GODivisionalButtonControl *GOManual::GetDivisional(unsigned index) {
   assert(index < m_divisionals.size());
   return m_divisionals[index];
 }
 
-void GOManual::AddDivisional(GODivisionalButton *divisional) {
+void GOManual::AddDivisional(GODivisionalButtonControl *divisional) {
   m_divisionals.push_back(divisional);
 }
 

src/grandorgue/GOManual.h

@@ -25,7 +25,7 @@
 class GOConfigReader;
 class GOConfigWriter;
 class GOCoupler;
-class GODivisionalButton;
+class GODivisionalButtonControl;
 class GOMidiEvent;
 class GOStop;
 class GOSwitch;
@@ -67,7 +67,7 @@ class GOManual : private GOEventHandler,
 
   ptr_vector<GOStop> m_stops;
   ptr_vector<GOCoupler> m_couplers;
-  ptr_vector<GODivisionalButton> m_divisionals;
+  ptr_vector<GODivisionalButtonControl> m_divisionals;
   unsigned m_ODFCouplerCount;
   bool m_displayed;
   GOCombinationDefinition m_DivisionalTemplate;
@@ -119,8 +119,8 @@ class GOManual : private GOEventHandler,
   GOCoupler *GetCoupler(unsigned index);
   void AddCoupler(GOCoupler *coupler);
   unsigned GetDivisionalCount();
-  GODivisionalButton *GetDivisional(unsigned index);
-  void AddDivisional(GODivisionalButton *divisional);
+  GODivisionalButtonControl *GetDivisional(unsigned index);
+  void AddDivisional(GODivisionalButtonControl *divisional);
   unsigned GetTremulantCount();
   GOTremulant *GetTremulant(unsigned index);
   unsigned GetSwitchCount();

src/grandorgue/GOMetronome.cpp

@@ -9,7 +9,7 @@
 
 #include <wx/intl.h>
 
-#include "combinations/gui/GOSetterButton.h"
+#include "combinations/control/GOSetterButtonControl.h"
 #include "config/GOConfig.h"
 #include "config/GOConfigReader.h"
 #include "config/GOConfigWriter.h"

src/grandorgue/GOModel.cpp

@@ -7,14 +7,14 @@
 
 #include "GOModel.h"
 
-#include "combinations/gui/GOGeneralButton.h"
+#include "combinations/control/GOGeneralButtonControl.h"
 #include "config/GOConfigReader.h"
+#include "control/GOPistonControl.h"
 
 #include "GODefinitionFile.h"
 #include "GODivisionalCoupler.h"
 #include "GOEnclosure.h"
 #include "GOManual.h"
-#include "GOPiston.h"
 #include "GORank.h"
 #include "GOSwitch.h"
 #include "GOTremulant.h"
@@ -117,7 +117,7 @@ void GOModel::Load(GOConfigReader &cfg, GODefinitionFile *organfile) {
     ODFSetting, group, wxT("NumberOfReversiblePistons"), 0, 32);
   m_piston.resize(0);
   for (unsigned i = 0; i < NumberOfReversiblePistons; i++) {
-    m_piston.push_back(new GOPiston(organfile));
+    m_piston.push_back(new GOPistonControl(organfile));
     m_piston[i]->Load(
       cfg, wxString::Format(wxT("ReversiblePiston%03d"), i + 1));
   }
@@ -136,8 +136,8 @@ void GOModel::Load(GOConfigReader &cfg, GODefinitionFile *organfile) {
     = cfg.ReadInteger(ODFSetting, group, wxT("NumberOfGenerals"), 0, 99);
   m_general.resize(0);
   for (unsigned i = 0; i < NumberOfGenerals; i++) {
-    m_general.push_back(
-      new GOGeneralButton(organfile->GetGeneralTemplate(), organfile, false));
+    m_general.push_back(new GOGeneralButtonControl(
+      organfile->GetGeneralTemplate(), organfile, false));
     m_general[i]->Load(cfg, wxString::Format(wxT("General%03d"), i + 1));
   }
 }
@@ -225,7 +225,7 @@ void GOModel::AddRank(GORank *rank) { m_ranks.push_back(rank); }
 
 unsigned GOModel::GetNumberOfReversiblePistons() { return m_piston.size(); }
 
-GOPiston *GOModel::GetPiston(unsigned index) { return m_piston[index]; }
+GOPistonControl *GOModel::GetPiston(unsigned index) { return m_piston[index]; }
 
 unsigned GOModel::GetDivisionalCouplerCount() {
   return m_divisionalcoupler.size();
@@ -237,6 +237,6 @@ GODivisionalCoupler *GOModel::GetDivisionalCoupler(unsigned index) {
 
 unsigned GOModel::GetGeneralCount() { return m_general.size(); }
 
-GOGeneralButton *GOModel::GetGeneral(unsigned index) {
+GOGeneralButtonControl *GOModel::GetGeneral(unsigned index) {
   return m_general[index];
 }