diff --git a/src/external/tunings/include/Tunings.h b/src/external/tunings/include/Tunings.h index 062f5519..c57a476e 100644 --- a/src/external/tunings/include/Tunings.h +++ b/src/external/tunings/include/Tunings.h @@ -57,7 +57,6 @@ namespace Tunings Type type = kToneRatio; double cents = 0; int ratio_d = 1, ratio_n = 1; - std::string stringRep = "1/1"; double floatValue = 1.0; // cents / 1200 + 1. }; diff --git a/src/external/tunings/src/Tunings.cpp b/src/external/tunings/src/Tunings.cpp index bc3c9d06..682cadfe 100644 --- a/src/external/tunings/src/Tunings.cpp +++ b/src/external/tunings/src/Tunings.cpp @@ -33,7 +33,6 @@ namespace Tunings Tone toneFromString(const std::string &line, int lineno) { Tone t; - t.stringRep = line; if (line.find(".") != std::string::npos) { t.type = Tone::kToneCents; @@ -145,25 +144,16 @@ namespace Tunings Scale evenTemperament12NoteScale() { - std::string data = R"SCL(! even.scl -! -12 note even temperament - 12 -! - 100.0 - 200.0 - 300.0 - 400.0 - 500.0 - 600.0 - 700.0 - 800.0 - 900.0 - 1000.0 - 1100.0 - 2/1 -)SCL"; - return parseSCLData(data); + Scale res; + res.count = 12; + res.tones.resize(12); + for (int i = 0; i < 12; ++i) { + Tone &t = res.tones[i]; + t.type = Tone::kToneCents; + t.cents = 100 * (i + 1); + t.floatValue = t.cents / 1200.0 + 1.0; + } + return res; } Scale evenDivisionOfSpanByM( int Span, int M )