Fixed absence of warnings of unused Pipe999ReleaseCrossfadeLength #1904…

… (#1980)
GrandOrgue · Aug 27, 2024 · 0dbc201 · 0dbc201
1 parent 666d2ab
commit 0dbc201
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Fixed absance of warnings of unused Pipe999ReleaseCrossfadeLength https://github.com/GrandOrgue/grandorgue/issues/1904
 - Fixed loading organ to not abort if reading InfoFilename failed and also fixed showing link in properties dialog if InfoFilename exists
 # 3.15.0 (2024-08-06)
 - Added capability of regex matching audio device names https://github.com/GrandOrgue/grandorgue/issues/1265

diff --git a/src/grandorgue/model/GOSoundingPipe.cpp b/src/grandorgue/model/GOSoundingPipe.cpp
@@ -94,10 +94,7 @@ void GOSoundingPipe::Init(
 }
 
 void GOSoundingPipe::LoadAttackFileInfo(
-  GOConfigReader &cfg,
-  const wxString &group,
-  const wxString &prefix,
-  bool isMainForSecondaryAttacks) {
+  GOConfigReader &cfg, const wxString &group, const wxString &prefix) {
   GOSoundProviderWave::AttackFileInfo ainfo;
 
   ainfo.filename.Assign(cfg.ReadFileName(ODFSetting, group, prefix));
@@ -167,15 +164,14 @@ void GOSoundingPipe::LoadAttackFileInfo(
   }
   ainfo.m_LoopCrossfadeLength = cfg.ReadInteger(
     ODFSetting, group, prefix + wxT("LoopCrossfadeLength"), 0, 3000, false, 0);
-  ainfo.m_ReleaseCrossfadeLength
-    = isMainForSecondaryAttacks || ainfo.load_release ? cfg.ReadInteger(
-        ODFSetting,
-        group,
-        prefix + wxT("ReleaseCrossfadeLength"),
-        0,
-        3000,
-        false,
-        0)
+  ainfo.m_ReleaseCrossfadeLength = ainfo.load_release ? cfg.ReadInteger(
+                                     ODFSetting,
+                                     group,
+                                     prefix + wxT("ReleaseCrossfadeLength"),
+                                     0,
+                                     3000,
+                                     false,
+                                     0)
                                                       : 0;
 
   m_AttackFileInfos.push_back(ainfo);
@@ -257,11 +253,11 @@ void GOSoundingPipe::Load(
   unsigned attack_count = cfg.ReadInteger(
     ODFSetting, group, prefix + wxT("AttackCount"), 0, 100, false, 0);
 
-  LoadAttackFileInfo(cfg, group, prefix, attack_count > 0);
+  LoadAttackFileInfo(cfg, group, prefix);
 
   for (unsigned i = 1; i <= attack_count; i++)
     LoadAttackFileInfo(
-      cfg, group, wxString::Format(wxT("%sAttack%03d"), prefix, i), false);
+      cfg, group, wxString::Format(wxT("%sAttack%03d"), prefix, i));
 
   unsigned release_count = cfg.ReadInteger(
     ODFSetting, group, prefix + wxT("ReleaseCount"), 0, 100, false, 0);

diff --git a/src/grandorgue/model/GOSoundingPipe.h b/src/grandorgue/model/GOSoundingPipe.h
@@ -56,10 +56,7 @@ class GOSoundingPipe : public GOPipe,
    * add it to m_AttackFileInfos
    */
   void LoadAttackFileInfo(
-    GOConfigReader &cfg,
-    const wxString &group,
-    const wxString &prefix,
-    bool isMain);
+    GOConfigReader &cfg, const wxString &group, const wxString &prefix);
   /* Read one release file info from the odf keys with the prefix specified and
    * add it to m_AttackFileInfos
    */