Extracted common code from GOPipeConfig::Init and GOPipeConfig::Load …

…to GOPipeConfig::LoadFromCmb
oleg68 · Jan 27, 2024 · 567f857 · 567f857
1 parent 15dac59
commit 567f857
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 84 deletions.
diff --git a/src/grandorgue/model/pipe-config/GOPipeConfig.cpp b/src/grandorgue/model/pipe-config/GOPipeConfig.cpp
@@ -43,37 +43,12 @@ static const wxString WX_TUNING = wxT("Tuning");
 static const wxString WX_MANUAL_TUNING = wxT("ManualTuning");
 static const wxString WX_AUTO_TUNING_CORRECTION = wxT("AutoTuningCorrection");
 
-void GOPipeConfig::ReadTuning(
-  GOConfigReader &cfg, const wxString &group, const wxString &prefix) {
-  // m_PitchTuning must be read before calling GOPipeConfig::ReadTuning
-  float legacyTuning = cfg.ReadFloat(
-    CMBSetting, group, prefix + WX_TUNING, -1800, 1800, false, m_PitchTuning);
-
-  m_ManualTuning = cfg.ReadFloat(
-    CMBSetting,
-    group,
-    prefix + WX_MANUAL_TUNING,
-    -1800,
-    1800,
-    false,
-    legacyTuning - m_PitchTuning);
-  m_AutoTuningCorrection = cfg.ReadFloat(
-    CMBSetting,
-    group,
-    prefix + WX_AUTO_TUNING_CORRECTION,
-    -1800,
-    1800,
-    false,
-    0);
-}
-
-void GOPipeConfig::Init(
+void GOPipeConfig::LoadFromCmb(
   GOConfigReader &cfg, const wxString &group, const wxString &prefix) {
   m_Group = group;
   m_NamePrefix = prefix;
   m_AudioGroup
     = cfg.ReadString(CMBSetting, group, prefix + wxT("AudioGroup"), false);
-  m_DefaultAmplitude = 100;
   m_Amplitude = cfg.ReadFloat(
     CMBSetting,
     group,
@@ -82,7 +57,6 @@ void GOPipeConfig::Init(
     1000,
     false,
     m_DefaultAmplitude);
-  m_DefaultGain = 0;
   m_Gain = cfg.ReadFloat(
     CMBSetting,
     group,
@@ -91,10 +65,27 @@ void GOPipeConfig::Init(
     40,
     false,
     m_DefaultGain);
-  m_PitchTuning = 0;
-  m_PitchCorrection = 0;
-  ReadTuning(cfg, group, prefix);
-  m_DefaultDelay = 0;
+  // m_PitchTuning must be read before calling GOPipeConfig::ReadTuning
+  float legacyTuning = cfg.ReadFloat(
+    CMBSetting, group, prefix + WX_TUNING, -1800, 1800, false, m_PitchTuning);
+
+  // m_PitchTuning must be read before calling GOPipeConfig::ReadTuning
+  m_ManualTuning = cfg.ReadFloat(
+    CMBSetting,
+    group,
+    prefix + WX_MANUAL_TUNING,
+    -1800,
+    1800,
+    false,
+    legacyTuning - m_PitchTuning);
+  m_AutoTuningCorrection = cfg.ReadFloat(
+    CMBSetting,
+    group,
+    prefix + WX_AUTO_TUNING_CORRECTION,
+    -1800,
+    1800,
+    false,
+    0);
   m_Delay = cfg.ReadInteger(
     CMBSetting, group, prefix + wxT("Delay"), 0, 10000, false, m_DefaultDelay);
   m_BitsPerSample = cfg.ReadInteger(
@@ -125,72 +116,32 @@ void GOPipeConfig::Init(
   m_Callback->UpdateAmplitude();
   m_Callback->UpdateTuning();
   m_Callback->UpdateAudioGroup();
+  m_Callback->UpdateReleaseTail();
+}
+
+void GOPipeConfig::Init(
+  GOConfigReader &cfg, const wxString &group, const wxString &prefix) {
+  m_DefaultAmplitude = 100;
+  m_DefaultGain = 0;
+  m_PitchTuning = 0;
+  m_PitchCorrection = 0;
+  m_DefaultDelay = 0;
+  LoadFromCmb(cfg, group, prefix);
 }
 
 void GOPipeConfig::Load(
   GOConfigReader &cfg, const wxString &group, const wxString &prefix) {
-  m_Group = group;
-  m_NamePrefix = prefix;
-  m_AudioGroup
-    = cfg.ReadString(CMBSetting, group, prefix + wxT("AudioGroup"), false);
   m_DefaultAmplitude = cfg.ReadFloat(
     ODFSetting, group, prefix + wxT("AmplitudeLevel"), 0, 1000, false, 100);
-  m_Amplitude = cfg.ReadFloat(
-    CMBSetting,
-    group,
-    prefix + wxT("Amplitude"),
-    0,
-    1000,
-    false,
-    m_DefaultAmplitude);
   m_DefaultGain = cfg.ReadFloat(
     ODFSetting, group, prefix + wxT("Gain"), -120, 40, false, 0);
-  m_Gain = cfg.ReadFloat(
-    CMBSetting,
-    group,
-    prefix + wxT("UserGain"),
-    -120,
-    40,
-    false,
-    m_DefaultGain);
   m_PitchTuning = cfg.ReadFloat(
     ODFSetting, group, prefix + wxT("PitchTuning"), -1800, 1800, false, 0);
   m_PitchCorrection = cfg.ReadFloat(
     ODFSetting, group, prefix + wxT("PitchCorrection"), -1800, 1800, false, 0);
-  ReadTuning(cfg, group, prefix);
   m_DefaultDelay = cfg.ReadInteger(
     ODFSetting, group, prefix + wxT("TrackerDelay"), 0, 10000, false, 0);
-  m_Delay = cfg.ReadInteger(
-    CMBSetting, group, prefix + wxT("Delay"), 0, 10000, false, m_DefaultDelay);
-  m_BitsPerSample = cfg.ReadInteger(
-    CMBSetting,
-    m_Group,
-    m_NamePrefix + wxT("BitsPerSample"),
-    -1,
-    24,
-    false,
-    -1);
-  if (m_BitsPerSample < 8 || m_BitsPerSample > 24)
-    m_BitsPerSample = -1;
-  m_Compress = cfg.ReadInteger(
-    CMBSetting, m_Group, m_NamePrefix + wxT("Compress"), -1, 1, false, -1);
-  m_Channels = cfg.ReadInteger(
-    CMBSetting, m_Group, m_NamePrefix + wxT("Channels"), -1, 2, false, -1);
-  m_LoopLoad = cfg.ReadInteger(
-    CMBSetting, m_Group, m_NamePrefix + wxT("LoopLoad"), -1, 2, false, -1);
-  m_AttackLoad = cfg.ReadInteger(
-    CMBSetting, m_Group, m_NamePrefix + wxT("AttackLoad"), -1, 1, false, -1);
-  m_ReleaseLoad = cfg.ReadInteger(
-    CMBSetting, m_Group, m_NamePrefix + wxT("ReleaseLoad"), -1, 1, false, -1);
-  m_IgnorePitch = cfg.ReadBooleanTriple(
-    CMBSetting, m_Group, m_NamePrefix + wxT("IgnorePitch"), false);
-  m_ReleaseTail = (unsigned)cfg.ReadInteger(
-    CMBSetting, group, m_NamePrefix + wxT("ReleaseTail"), 0, 3000, false, 0);
-
-  m_Callback->UpdateAmplitude();
-  m_Callback->UpdateTuning();
-  m_Callback->UpdateAudioGroup();
-  m_Callback->UpdateReleaseTail();
+  LoadFromCmb(cfg, group, prefix);
 }
 
 void GOPipeConfig::Save(GOConfigWriter &cfg) {

diff --git a/src/grandorgue/model/pipe-config/GOPipeConfig.h b/src/grandorgue/model/pipe-config/GOPipeConfig.h
@@ -43,14 +43,21 @@ class GOPipeConfig {
   int m_IgnorePitch;
   unsigned m_ReleaseTail; // the max release length in ms
 
-  void ReadTuning(
+  // Load all customizable values from the .cmb
+  void LoadFromCmb(
     GOConfigReader &cfg, const wxString &group, const wxString &prefix);
 
 public:
   GOPipeConfig(GOPipeConfigListener &listener, GOPipeUpdateCallback *callback);
 
+  // Set default values and load all customizable values from the .cmb
   void Init(GOConfigReader &cfg, const wxString &group, const wxString &prefix);
+
+  // Load default values from the ODF and and load all customizable values from
+  // the .cmb
   void Load(GOConfigReader &cfg, const wxString &group, const wxString &prefix);
+
+  // Save all customizable values to the .cmb
   void Save(GOConfigWriter &cfg);
 
   GOPipeUpdateCallback *GetCallback();