comparison chromamethods.cpp @ 120:7a8956e903e1 monophonicness

minor changes for fewer warnings
author matthiasm
date Fri, 15 Apr 2011 10:01:53 +0000
parents 526250b06fe0
children 21181297da99
comparison
equal deleted inserted replaced
119:c4d1208e5ea9 120:7a8956e903e1
272 vector<string> chordnames; 272 vector<string> chordnames;
273 chordnames.push_back("");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,0 273 chordnames.push_back("");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,0
274 chordnames.push_back("");// =0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,0 274 chordnames.push_back("");// =0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,0
275 chordnames.push_back("m");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,0,0 275 chordnames.push_back("m");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,0,0
276 chordnames.push_back("m");//=0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,0,0 276 chordnames.push_back("m");//=0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,0,0
277 chordnames.push_back("hdim7");//=0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,1,0,0,1,0,0,0,1,0 277 chordnames.push_back("m7b5");//=0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,1,0,0,1,0,0,0,1,0
278 chordnames.push_back("hdim7");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,1,0,0,0,1,0 278 chordnames.push_back("m7b5");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,1,0,0,0,1,0
279 chordnames.push_back("6");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,1,0,1,0,0 279 chordnames.push_back("6");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,1,0,1,0,0
280 chordnames.push_back("7");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,1,0 280 chordnames.push_back("7");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,1,0
281 chordnames.push_back("maj7");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,1 281 chordnames.push_back("maj7");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,1
282 chordnames.push_back("m7");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0 282 chordnames.push_back("m7");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0
283 chordnames.push_back("m6");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,1,0,0 283 chordnames.push_back("m6");//=1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,1,0,0
347 string chordDictBase("chord.dict"); 347 string chordDictBase("chord.dict");
348 string chordDictFilename; 348 string chordDictFilename;
349 349
350 vector<string> ppath = getPluginPath(); 350 vector<string> ppath = getPluginPath();
351 351
352 const char* notenames[24] = {
353 "A (bass)","Bb (bass)","B (bass)","C (bass)","C# (bass)","D (bass)","Eb (bass)","E (bass)","F (bass)","F# (bass)","G (bass)","Ab (bass)",
354 "A","Bb","B","C","C#","D","Eb","E","F","F#","G","Ab"};
355
356 const char* bassnames[13][12] ={
357 {"A","","B","C","C#","D","","E","","F#","G","G#"},
358 {"Bb","","C","Db","D","Eb","","F","","G","Ab","A"},
359 {"B","","C#","D","D#","E","","F#","","G#","A","A#"},
360 {"C","","D","Eb","E","F","","G","","A","Bb","B"},
361 {"C#","","D#","E","E#","F#","","G#","","A#","B","B#"},
362 {"D","","E","F","F#","G","","A","","B","C","C#"},
363 {"Eb","","F","Gb","G","Ab","","Bb","","C","Db","D"},
364 {"E","","F#","G","G#","A","","B","","C#","D","D#"},
365 {"F","","G","Ab","A","Bb","","C","","D","Eb","E"},
366 {"F#","","G#","A","A#","B","","C#","","D#","E","E#"},
367 {"G","","A","Bb","B","C","","D","","E","F","F#"},
368 {"Ab","","Bb","Cb","C","Db","","Eb","","F","Gb","G"},
369 {"1","","2","b3","3","4","","5","","6","b7","7"}
370 };
371
352 bool hasExternalDictinoary = true; 372 bool hasExternalDictinoary = true;
353 373
354 for (size_t i = 0; i < ppath.size(); ++i) { 374 for (size_t i = 0; i < ppath.size(); ++i) {
355 chordDictFilename = ppath[i] + "/" + chordDictBase; 375 chordDictFilename = ppath[i] + "/" + chordDictBase;
356 cerr << "Looking for chord.dict in " << chordDictFilename << "..." ; 376 cerr << "Looking for chord.dict in " << chordDictFilename << "..." ;