Only allow parent to set tone balance value if child is zero. Removed…

… not needed effective tone balance function.
larspalo · May 14, 2024 · acd1b78 · acd1b78
1 parent 2dbe935
commit acd1b78
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/src/grandorgue/dialogs/GOOrganSettingsDialog.cpp b/src/grandorgue/dialogs/GOOrganSettingsDialog.cpp
@@ -1246,8 +1246,10 @@ void GOOrganSettingsDialog::ApplyToneBalanceRecursively(
   for (unsigned i = 0; i < node->GetChildCount(); i++) {
     GOPipeConfigNode *child = node->GetChild(i);
     if (child) {
-      child->GetPipeConfig().SetToneBalanceValue(value);
-      ApplyToneBalanceRecursively(child, value);
+      if (!child->GetPipeConfig().GetToneBalanceValue()) {
+        child->GetPipeConfig().SetToneBalanceValue(value);
+        ApplyToneBalanceRecursively(child, value);
+      }
     }
   }
 }

diff --git a/src/grandorgue/model/GOSoundingPipe.cpp b/src/grandorgue/model/GOSoundingPipe.cpp
@@ -559,7 +559,7 @@ void GOSoundingPipe::UpdateReleaseTail() {
 
 void GOSoundingPipe::UpdateToneBalance() {
   m_SoundProvider.SetToneBalanceValue(
-    m_PipeConfigNode.GetEffectiveToneBalanceValue());
+    m_PipeConfigNode.GetPipeConfig().GetToneBalanceValue());
 }
 
 void GOSoundingPipe::SetTemperament(const GOTemperament &temperament) {

diff --git a/src/grandorgue/model/pipe-config/GOPipeConfigNode.cpp b/src/grandorgue/model/pipe-config/GOPipeConfigNode.cpp
@@ -74,10 +74,6 @@ uint16_t GOPipeConfigNode::GetEffectiveReleaseTail() const {
   return releaseTail;
 }
 
-int8_t GOPipeConfigNode::GetEffectiveToneBalanceValue() const {
-  return m_PipeConfig.GetToneBalanceValue();
-}
-
 uint8_t GOPipeConfigNode::GetEffectiveUint8(
   int8_t (GOPipeConfig::*getThisValue)() const,
   uint8_t (GOPipeConfigNode::*getParentValue)() const,

diff --git a/src/grandorgue/model/pipe-config/GOPipeConfigNode.h b/src/grandorgue/model/pipe-config/GOPipeConfigNode.h
@@ -112,8 +112,6 @@ class GOPipeConfigNode : private GOSaveableObject {
 
   uint16_t GetEffectiveReleaseTail() const;
 
-  int8_t GetEffectiveToneBalanceValue() const;
-
   uint8_t GetEffectiveBitsPerSample() const {
     return GetEffectiveUint8(
       &GOPipeConfig::GetBitsPerSample,