Mercurial > hg > nnls-chroma

changeset 148:5a7f78c34133

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author matthiasm
date Thu, 05 Sep 2013 03:11:04 +0100
parents a85e745c0721 (current diff) 2cd99c0810f2 (diff)
children c40de221b5df
files
diffstat 2 files changed, 11 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.linux	Thu Sep 05 03:10:30 2013 +0100
+++ b/Makefile.linux	Thu Sep 05 03:11:04 2013 +0100
@@ -25,15 +25,11 @@
 	rm -f *.o
 
 # DO NOT DELETE
-
-nnls.o: nnls.h
-Chordino.o: Chordino.h NNLSBase.h chromamethods.h nnls.h
-chromamethods.o: chromamethods.h nnls.h chorddict.cpp
-NNLSBase.o: NNLSBase.h chromamethods.h nnls.h
-NNLSChroma.o: NNLSChroma.h NNLSBase.h chromamethods.h nnls.h
-plugins.o: NNLSChroma.h NNLSBase.h Chordino.h Tuning.h
-Tuning.o: Tuning.h NNLSBase.h chromamethods.h nnls.h
-Chordino.o: NNLSBase.h
-chromamethods.o: nnls.h
-NNLSChroma.o: NNLSBase.h
-Tuning.o: NNLSBase.h
+
+Chordino.o: Chordino.h NNLSBase.h chromamethods.h nnls.h viterbi.h
+chromamethods.o: chromamethods.h nnls.h
+NNLSBase.o: NNLSBase.h chromamethods.h nnls.h
+NNLSChroma.o: NNLSChroma.h NNLSBase.h chromamethods.h nnls.h
+plugins.o: NNLSChroma.h NNLSBase.h Chordino.h Tuning.h
+Tuning.o: Tuning.h NNLSBase.h chromamethods.h nnls.h
+viterbi.o: viterbi.h
--- a/chromamethods.cpp	Thu Sep 05 03:10:30 2013 +0100
+++ b/chromamethods.cpp	Thu Sep 05 03:11:04 2013 +0100
@@ -142,7 +142,7 @@
         // cerr << cosp << endl;
     }
 
-    for (int i = 0; i < nFFT * cq_f.size(); ++i) {
+    for (int i = 0; i < nFFT * (int)cq_f.size(); ++i) {
         outmatrix[i] = 0.f;
     }
 	
@@ -183,14 +183,14 @@
     }
     cq_f.push_back(440 * pow(2.0,0.083333 * (maxMIDI-69)));
 
-    float curr_f;
+//    float curr_f;
     float floatbin;
     float curr_amp;
     // now for every combination calculate the matrix element
     for (int iOut = 0; iOut < 12 * (maxoctave - minoctave); ++iOut) {
         // cerr << iOut << endl;
         for (int iHarm = 1; iHarm <= 20; ++iHarm) {
-            curr_f = 440 * pow(2,(minMIDI-69+iOut)*1.0/12) * iHarm;
+//            curr_f = 440 * pow(2,(minMIDI-69+iOut)*1.0/12) * iHarm;
             // if (curr_f > cq_f[nNote-1])  break;
             floatbin = ((iOut + 1) * binspersemitone + 1) + binspersemitone * 12 * log2(iHarm);
             // cerr << floatbin << endl;