Mercurial > hg > silvet

changeset 277:3148edeb5336

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Mon, 04 Aug 2014 15:16:00 +0100
parents 537205426492 (current diff) 4e19c60241cb (diff)
children 34768d6642aa
files
diffstat 3 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Mon Aug 04 15:15:34 2014 +0100
+++ b/.hgsubstate	Mon Aug 04 15:16:00 2014 +0100
@@ -1,3 +1,3 @@
 a2621605a8c2119bb063c59e83f4fe792a58e4ac bqvec
-e6b00b4788bedadb1ca855ea4f67a765fbe52034 constant-q-cpp
+c5d37d1ed0f8a04c851ca3cfeb70125c3ac9ca9e constant-q-cpp
 d25a2e91e9d84aaff25e5d746398232d182d127d flattendynamics
--- a/src/EM.cpp	Mon Aug 04 15:15:34 2014 +0100
+++ b/src/EM.cpp	Mon Aug 04 15:16:00 2014 +0100
@@ -40,9 +40,7 @@
     m_sourceCount(pack->templates.size()),
     m_pitchSparsity(1.1),
     m_shiftSparsity(1.1),
-    m_sourceSparsity(1.2),
-    m_lowestPitch(pack->lowestNote),
-    m_highestPitch(pack->highestNote)
+    m_sourceSparsity(1.2)
 {
     m_pitches = allocate<float>(m_noteCount);
     m_updatePitches = allocate<float>(m_noteCount);
--- a/src/EM.h	Mon Aug 04 15:15:34 2014 +0100
+++ b/src/EM.h	Mon Aug 04 15:16:00 2014 +0100
@@ -97,9 +97,6 @@
     float m_shiftSparsity;
     float m_sourceSparsity;
 
-    const int m_lowestPitch;
-    const int m_highestPitch;
-
     void normaliseColumn(float *column, int size);
     void normaliseGrid(float **grid, int size1, int size2);