changeset 49:9b17bbd16a5f

Use supplied pitch ranges, plus subrepo update
author Chris Cannam
date Mon, 07 Apr 2014 16:21:57 +0100
parents d7f1c10f4e1d
children ce1d88759557 782ca0d9ff3e
files src/EM.cpp src/Silvet.cpp
diffstat 2 files changed, 2 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/EM.cpp	Mon Apr 07 14:18:22 2014 +0100
+++ b/src/EM.cpp	Mon Apr 07 16:21:57 2014 +0100
@@ -37,17 +37,8 @@
     m_pitchSparsity(1.1),
     m_sourceSparsity(1.3)
 {
-    m_lowest = 0;
-    m_highest = m_notes - 1;
-
-    for (int i = 0; i < m_instruments; ++i) {
-        if (i == 0 || silvet_templates[i].lowest < m_lowest) {
-            m_lowest = silvet_templates[i].lowest;
-        }
-        if (i == 0 || silvet_templates[i].highest > m_highest) {
-            m_highest = silvet_templates[i].highest;
-        }
-    }
+    m_lowest = silvet_templates_lowest_note;
+    m_highest = silvet_templates_highest_note;
 
     m_pitches = V(m_notes);
 
--- a/src/Silvet.cpp	Mon Apr 07 14:18:22 2014 +0100
+++ b/src/Silvet.cpp	Mon Apr 07 16:21:57 2014 +0100
@@ -348,7 +348,6 @@
         for (int j = 0; j < processingHeight; ++j) {
             sum += filtered[i][j];
         }
-        cerr << "sum = " << sum << endl;
 
         if (sum < 1e-5) continue;