Renamed ChurchName to OrganName and moved from GOOrganController to GOOrganModel (#2119)

Author: oleg68

src/grandorgue/GODocument.cpp

@@ -76,7 +76,7 @@ bool GODocument::LoadOrgan(
   }
 
   wxCommandEvent event(wxEVT_WINTITLE, 0);
-  event.SetString(m_OrganController->GetChurchName());
+  event.SetString(m_OrganController->GetOrganName());
   wxTheApp->GetTopWindow()->GetEventHandler()->AddPendingEvent(event);
 
   for (unsigned i = 0; i < m_OrganController->GetPanelCount(); i++)

src/grandorgue/GOOrganController.cpp

@@ -106,7 +106,6 @@ GOOrganController::GOOrganController(
     m_b_customized(false),
     m_CurrentPitch(999999.0), // for enforcing updating the label first time
     m_OrganModified(false),
-    m_ChurchName(),
     m_ChurchAddress(),
     m_OrganBuilder(),
     m_OrganBuildDate(),
@@ -209,7 +208,6 @@ void GOOrganController::ReadOrganFile(GOConfigReader &cfg) {
   /* load church info */
   cfg.ReadString(
     ODFSetting, WX_ORGAN, wxT("HauptwerkOrganFileFormatVersion"), false);
-  m_ChurchName = cfg.ReadStringTrim(ODFSetting, WX_ORGAN, wxT("ChurchName"));
   m_ChurchAddress = cfg.ReadString(ODFSetting, WX_ORGAN, wxT("ChurchAddress"));
   m_OrganBuilder
     = cfg.ReadString(ODFSetting, WX_ORGAN, wxT("OrganBuilder"), false);
@@ -325,12 +323,16 @@ void GOOrganController::ReadOrganFile(GOConfigReader &cfg) {
   for (unsigned i = 0; i < m_panels.size(); i++)
     m_panels[i]->Layout();
 
-  GetRootPipeConfigNode().SetName(GetChurchName());
+  const wxString &organName = GetOrganName();
+
+  GetRootPipeConfigNode().SetName(organName);
   ReadCombinations(cfg);
   m_setter->OnCombinationsLoaded(GetCombinationsDir(), wxEmptyString);
 
   GOHash hash;
-  hash.Update(m_ChurchName.utf8_str(), strlen(m_ChurchName.utf8_str()));
+  const auto organNameUtf8 = organName.utf8_str();
+
+  hash.Update(organNameUtf8, strlen(organNameUtf8));
   GOHashType result = hash.getHash();
   m_SampleSetId1 = ((result.hash[0] & 0x7F) << 24)
     | ((result.hash[1] & 0x7F) << 16) | ((result.hash[2] & 0x7F) << 8)
@@ -340,8 +342,6 @@ void GOOrganController::ReadOrganFile(GOConfigReader &cfg) {
     | (result.hash[7] & 0x7F);
 }
 
-wxString GOOrganController::GetOrganHash() { return m_hash; }
-
 wxString GOOrganController::GenerateSettingFileName() {
   return m_config.OrganSettingsPath() + wxFileName::GetPathSeparator()
     + GOStdFileName::composeSettingFileName(GetOrganHash(), m_config.Preset());
@@ -643,7 +643,7 @@ wxString GOOrganController::ExportCombination(const wxString &fileName) {
     YAML::Node infoNode = globalNode[INFO];
 
     infoNode[CONTENT_TYPE] = WX_GRANDORGUE_COMBINATIONS;
-    infoNode[ORGAN_NAME] = m_ChurchName;
+    infoNode[ORGAN_NAME] = GetOrganName();
     infoNode[GRANDORGUE_VERSION] = APP_VERSION;
     infoNode[SAVED_TIME] = wxDateTime::Now().Format();
 
@@ -668,29 +668,29 @@ wxString GOOrganController::ExportCombination(const wxString &fileName) {
 }
 
 /**
- * Check the churchName of the imported combination file. If it differs from the
- * current organ m_ChurchName then ask for the user
- * @param churchName the organ the combination file was saved of
+ * Check the organName of the imported combination file. If it differs from the
+ * current organ name then ask for the user
+ * @param organName the organ the combination file was saved of
  * @return true if the churchNames are the same or the user agree with importing
  *   the combination file
  */
 bool GOOrganController::IsToImportCombinationsFor(
-  const wxString &fileName, const wxString &churchName) const {
+  const wxString &fileName, const wxString &organName) const {
   bool isToImport = true;
 
-  if (churchName != m_ChurchName) {
+  if (organName != GetOrganName()) {
     wxLogWarning(
       _("This combination file '%s' was originally made for another organ "
         "'%s'"),
       fileName,
-      churchName);
+      organName);
     isToImport = wxMessageBox(
                    wxString::Format(
                      _("This combination file '%s' was originally made for "
                        "another organ '%s'. Importing it can cause various "
                        "problems. Should it really be imported?"),
                      fileName,
-                     churchName),
+                     organName),
                    _("Import Combinations"),
                    wxYES_NO,
                    NULL)
@@ -866,7 +866,7 @@ bool GOOrganController::Export(const wxString &cmb) {
 
   m_b_customized = true;
   cfg.WriteString(WX_ORGAN, wxT("ODFHash"), m_ODFHash);
-  cfg.WriteString(WX_ORGAN, wxT("ChurchName"), m_ChurchName);
+  cfg.WriteString(WX_ORGAN, wxT("ChurchName"), GetOrganName());
   cfg.WriteString(WX_ORGAN, wxT("ChurchAddress"), m_ChurchAddress);
   cfg.WriteString(WX_ORGAN, wxT("ODFPath"), GetODFFilename());
   if (m_ArchiveID != wxEmptyString)
@@ -943,8 +943,6 @@ void GOOrganController::AddPanel(GOGUIPanel *panel) {
   m_panels.push_back(panel);
 }
 
-const wxString &GOOrganController::GetChurchName() { return m_ChurchName; }
-
 const wxString &GOOrganController::GetChurchAddress() {
   return m_ChurchAddress;
 }
@@ -987,7 +985,7 @@ GOOrgan GOOrganController::GetOrganInfo() {
     GetODFFilename(),
     m_ArchiveID,
     m_ArchivePath,
-    GetChurchName(),
+    GetOrganName(),
     GetOrganBuilder(),
     GetRecordingDetails());
 }
@@ -999,7 +997,7 @@ const wxString GOOrganController::GetSettingFilename() {
 const wxString GOOrganController::GetCacheFilename() { return m_CacheFilename; }
 
 wxString GOOrganController::GetCombinationsDir() const {
-  return wxFileName(m_config.OrganCombinationsPath(), m_ChurchName)
+  return wxFileName(m_config.OrganCombinationsPath(), GetOrganName())
     .GetFullPath();
 }
 

src/grandorgue/GOOrganController.h

@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -82,7 +82,6 @@ class GOOrganController : public GOEventDistributor,
   float m_CurrentPitch; // organ pitch
   bool m_OrganModified; // always m_IsOrganModified >= IsModelModified()
 
-  wxString m_ChurchName;
   wxString m_ChurchAddress;
   wxString m_OrganBuilder;
   wxString m_OrganBuildDate;
@@ -121,7 +120,7 @@ class GOOrganController : public GOEventDistributor,
   void SetTemperament(const GOTemperament &temperament);
   void PreconfigRecorder();
 
-  wxString GetOrganHash();
+  const wxString &GetOrganHash() const { return m_hash; }
   bool IsToImportCombinationsFor(
     const wxString &fileName, const wxString &churchName) const;
 
@@ -226,7 +225,6 @@ class GOOrganController : public GOEventDistributor,
   wxString GetCombinationsDir() const;
 
   /* Organ and Building general information */
-  const wxString &GetChurchName();
   const wxString &GetChurchAddress();
   const wxString &GetOrganBuilder();
   const wxString &GetOrganBuildDate();

src/grandorgue/combinations/GOSetter.cpp

@@ -985,7 +985,7 @@ void GOSetter::PreparePlayback() {
   buffer.Printf(wxT("%03d"), m_pos);
   m_PosDisplay.SetContent(buffer);
 
-  m_NameDisplay.SetContent(m_OrganController->GetChurchName());
+  m_NameDisplay.SetContent(m_OrganController->GetOrganName());
 
   wxCommandEvent event(wxEVT_SETVALUE, ID_METER_FRAME_SPIN);
   event.SetInt(m_pos);

src/grandorgue/gui/dialogs/GOPropertiesDialog.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -75,7 +75,7 @@ GOPropertiesDialog::GOPropertiesDialog(
 
   sizer->Add(GOPropertiesText(this, 0, _("Title")), 0);
   sizer->Add(
-    GOPropertiesText(this, 300, m_OrganController->GetChurchName()),
+    GOPropertiesText(this, 300, m_OrganController->GetOrganName()),
     0,
     wxLEFT,
     10);

src/grandorgue/gui/panels/GOGUIPanel.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -151,7 +151,7 @@ void GOGUIPanel::Load(GOConfigReader &cfg, const wxString &group) {
     new_format = true;
 
   if (cfgGroup.IsEmpty()) {
-    m_Name = m_OrganController->GetChurchName();
+    m_Name = m_OrganController->GetOrganName();
     m_GroupName = wxT("");
     cfgGroup = wxT("Organ");
     if (new_format) {

src/grandorgue/midi/GOMidiRecorder.cpp

@@ -351,7 +351,7 @@ void GOMidiRecorder::StartRecording(bool rename) {
   Write(&h, sizeof(h));
   Write(&t, sizeof(t));
 
-  wxString s = m_OrganController->GetChurchName();
+  wxString s = m_OrganController->GetOrganName();
   wxCharBuffer b = s.ToAscii();
   unsigned len = s.length();
   unsigned char th[] = {0x00, 0xFF, 0x04};

src/grandorgue/model/GOOrganModel.cpp

@@ -47,6 +47,7 @@ unsigned GOOrganModel::GetRecorderElementID(const wxString &name) {
 static const wxString WX_ORGAN = wxT("Organ");
 
 void GOOrganModel::Load(GOConfigReader &cfg) {
+  m_OrganName = cfg.ReadStringTrim(ODFSetting, WX_ORGAN, wxT("ChurchName"));
   m_DivisionalsStoreIntermanualCouplers = cfg.ReadBoolean(
     ODFSetting, WX_ORGAN, wxT("DivisionalsStoreIntermanualCouplers"));
   m_DivisionalsStoreIntramanualCouplers = cfg.ReadBoolean(

src/grandorgue/model/GOOrganModel.h

@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -47,6 +47,7 @@ class GOOrganModel : private GOCombinationButtonSet,
   GOModificationProxy m_ModificationProxy;
   GOCombinationDefinition m_GeneralTemplate;
 
+  wxString m_OrganName;
   bool m_DivisionalsStoreIntermanualCouplers;
   bool m_DivisionalsStoreIntramanualCouplers;
   bool m_DivisionalsStoreTremulants;
@@ -106,6 +107,8 @@ class GOOrganModel : private GOCombinationButtonSet,
   const GOConfig &GetConfig() const { return m_config; }
   GOConfig &GetConfig() { return m_config; }
 
+  const wxString &GetOrganName() const { return m_OrganName; }
+
   unsigned GetRecorderElementID(const wxString &name);
 
   const GOCombinationDefinition &GetGeneralTemplate() const {