Mercurial > hg > tony

changeset 417:912a7212e0cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes to muting from level-pan tool button
author Chris Cannam
date Wed, 25 Mar 2015 11:09:33 +0000
parents e97749eebe1a
children f041a5a66b35
files .hgsubstate src/MainWindow.cpp
diffstat 2 files changed, 19 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Mar 25 11:01:18 2015 +0000
+++ b/.hgsubstate	Wed Mar 25 11:09:33 2015 +0000
@@ -4,4 +4,4 @@
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 345d41a3567f44ff4febf5ef4c4022e79d31eba4 svapp
 c49d52386cde0844cef30d8904a4fe409cec3d5c svcore
-86df7de08e033b0d0abd5251a05ac1bf11e8cf70 svgui
+7cf497b72da3ffeb2ea08f3f6b202db1b935116d svgui
--- a/src/MainWindow.cpp	Wed Mar 25 11:01:18 2015 +0000
+++ b/src/MainWindow.cpp	Wed Mar 25 11:09:33 2015 +0000
@@ -2557,7 +2557,12 @@
     double db = AudioLevel::multiplier_to_dB(gain);
     cerr << "gain = " << gain << " (" << db << " dB)" << endl;
     contextHelpChanged(tr("Audio Gain: %1 dB").arg(db));
-    m_analyser->setGain(Analyser::Audio, gain);
+    if (gain == 0.f) {
+        m_analyser->setAudible(Analyser::Audio, false);
+    } else {
+        m_analyser->setAudible(Analyser::Audio, true);
+        m_analyser->setGain(Analyser::Audio, gain);
+    }
     updateMenuStates();
 } 
 
@@ -2567,7 +2572,12 @@
     double db = AudioLevel::multiplier_to_dB(gain);
     cerr << "gain = " << gain << " (" << db << " dB)" << endl;
     contextHelpChanged(tr("Pitch Gain: %1 dB").arg(db));
-    m_analyser->setGain(Analyser::PitchTrack, gain);
+    if (gain == 0.f) {
+        m_analyser->setAudible(Analyser::PitchTrack, false);
+    } else {
+        m_analyser->setAudible(Analyser::PitchTrack, true);
+        m_analyser->setGain(Analyser::PitchTrack, gain);
+    }
     updateMenuStates();
 } 
 
@@ -2577,7 +2587,12 @@
     double db = AudioLevel::multiplier_to_dB(gain);
     cerr << "gain = " << gain << " (" << db << " dB)" << endl;
     contextHelpChanged(tr("Notes Gain: %1 dB").arg(db));
-    m_analyser->setGain(Analyser::Notes, gain);
+    if (gain == 0.f) {
+        m_analyser->setAudible(Analyser::Notes, false);
+    } else {
+        m_analyser->setAudible(Analyser::Notes, true);
+        m_analyser->setGain(Analyser::Notes, gain);
+    }
     updateMenuStates();
 }