Mercurial > hg > nnls-chroma

changeset 137:02ab98e51436 darwintunes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applying Johan Pauwels patch
author matthiasm
date Tue, 19 Jun 2012 15:25:20 +0100
parents 2748660cb421
children 696010749be3
files Makefile.linux Makefile.osx chromamethods.cpp nnls-chroma.n3
diffstat 4 files changed, 6 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.linux	Tue Jun 19 15:22:31 2012 +0100
+++ b/Makefile.linux	Tue Jun 19 15:25:20 2012 +0100
@@ -28,7 +28,7 @@
 
 nnls.o: nnls.h
 Chordino.o: Chordino.h NNLSBase.h chromamethods.h nnls.h
-chromamethods.o: chromamethods.h nnls.h chorddict.cpp
+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
--- a/Makefile.osx	Tue Jun 19 15:22:31 2012 +0100
+++ b/Makefile.osx	Tue Jun 19 15:25:20 2012 +0100
@@ -32,7 +32,7 @@
 
 nnls.o: nnls.h
 Chordino.o: Chordino.h NNLSBase.h chromamethods.h nnls.h
-chromamethods.o: chromamethods.h nnls.h chorddict.cpp
+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
--- a/chromamethods.cpp	Tue Jun 19 15:22:31 2012 +0100
+++ b/chromamethods.cpp	Tue Jun 19 15:25:20 2012 +0100
@@ -31,8 +31,6 @@
 #include <boost/iostreams/stream.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "chorddict.cpp"
-
 using namespace std;
 using namespace boost;
 
@@ -355,7 +353,7 @@
 	    "A  (bass)","Bb (bass)","B  (bass)","C  (bass)","C# (bass)","D  (bass)","Eb (bass)","E  (bass)","F  (bass)","F# (bass)","G  (bass)","Ab (bass)",
 	    "A","Bb","B","C","C#","D","Eb","E","F","F#","G","Ab"};
 
-	const char* bassnames[13][12] ={
+	const char* bassnames[12][12] ={
 	    {"A","","B","C","C#","D","","E","","F#","G","G#"},
 	    {"Bb","","C","Db","D","Eb","","F","","G","Ab","A"},
 	    {"B","","C#","D","D#","E","","F#","","G#","A","A#"},
@@ -367,8 +365,7 @@
 	    {"F","","G","Ab","A","Bb","","C","","D","Eb","E"},
 	    {"F#","","G#","A","A#","B","","C#","","D#","E","E#"},
 	    {"G","","A","Bb","B","C","","D","","E","F","F#"},
-	    {"Ab","","Bb","Cb","C","Db","","Eb","","F","Gb","G"},
-		{"1","","2","b3","3","4","","5","","6","b7","7"}
+	    {"Ab","","Bb","Cb","C","Db","","Eb","","F","Gb","G"}
 	};
 
     bool hasExternalDictinoary = true;
@@ -408,7 +405,6 @@
     vector<string> loadedChordNames;
     vector<float> loadedChordDict;
     if (hasExternalDictinoary && chordDictFile.is_open()) {
-        cerr << "-----------------> " << tempChordNames.size() << endl;
         tempChordDict.clear();
         tempChordNames.clear();
         while (std::getline(chordDictFile, line)) { // loop over lines in chord.dict file	            	
@@ -435,6 +431,7 @@
                 tempChordNames.push_back(chordType);
             }
         }
+        cerr << "-----------------> " << tempChordNames.size() << endl;
     }
     
         
@@ -448,8 +445,6 @@
                 if (tempChordDict[24*iType+(kSemitone) % 12] > 0.99) {
 					if (harte_syntax == 0.0) {
 						slashNotation = bassnames[iSemitone][kSemitone];
-					} else {
-						slashNotation = bassnames[12][kSemitone];
 					}                    
                 }
             }
--- a/nnls-chroma.n3	Tue Jun 19 15:22:31 2012 +0100
+++ b/nnls-chroma.n3	Tue Jun 19 15:25:20 2012 +0100
@@ -1,7 +1,7 @@
 @prefix rdfs:     <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd:      <http://www.w3.org/2001/XMLSchema#> .
 @prefix vamp:     <http://purl.org/ontology/vamp/> .
-@prefix plugbase: <http://vamp-plugins.org/rdf/plugins/nnls-chromannls-chroma#> .
+@prefix plugbase: <http://vamp-plugins.org/rdf/plugins/nnls-chroma#> .
 @prefix owl:      <http://www.w3.org/2002/07/owl#> .
 @prefix dc:       <http://purl.org/dc/elements/1.1/> .
 @prefix af:       <http://purl.org/ontology/af/> .