X-Git-Url: http://git.johnwright.org/?p=fmit.git;a=blobdiff_plain;f=libs%2FMusic%2FMusic.cpp;h=03db216938c23c07e0f6575496049b29ba55d83b;hp=71847cdba93b80d1e6a2e3d49b224558224f3fd9;hb=adfba0402927438a1869f1e716bcf0e25574ce1e;hpb=4b957a098b637ebe4d07827a80aeae157791a148

diff --git a/libs/Music/Music.cpp b/libs/Music/Music.cpp
index 71847cd..03db216 100644
--- a/libs/Music/Music.cpp
+++ b/libs/Music/Music.cpp
@@ -24,7 +24,15 @@
 using namespace std;
 
 Music::NotesName Music::s_notes_name = Music::LOCAL_ANGLO;
+
 int Music::s_tonality = 0;
+double Music::s_semitones[13] = { 1.0000, 1.0595, 1.1225, 1.1892, 1.2599, 1.3348, 1.4142, 1.4983, 1.5874, 1.6818, 1.7818, 1.8877, 2.0000 }; // Chromatic, never used
+static double semitones_werckmeister3[] = { 1.0, 1.06425952556, 1.125, 1.19729196625, 1.26134462288, 1.33785800438, 1.41901270074, 1.5, 1.59638928833, 1.68179283051, 1.78986403988, 1.89201693432, 2.0 };
+static double semitones_kirnberger3[] = { 1.0, 1.06335913331, 1.12151158592, 1.19627902498, 1.26027749133, 1.33748060995, 1.41781217775, 1.49534878122, 1.59503869997, 1.68036998845, 1.788854382, 1.890416237, 2.0 };
+static double semitones_diatonic[] = { 1.0, 1.06666666667, 1.125, 1.2, 1.25, 1.35, 1.44, 1.5, 1.6, 1.6875, 1.8, 1.875, 2.0 };
+static double semitones_meantone[] = { 1.0, 1.06998448796, 1.11803398875, 1.19627902498, 1.25, 1.33748060995, 1.4310835056, 1.49534878122, 1.6, 1.67185076244, 1.788854382, 1.86918597653, 2.0};
+Music::Tuning Music::s_tuning = Music::CHROMATIC;
+
 int Music::s_sampling_rate = -1;
 double Music::s_AFreq = 440.0;
 const int Music::UNDEFINED_SEMITONE = -1000;
@@ -51,6 +59,41 @@ void Music::RemoveSettingsListener(SettingsListener* l)
 	s_settings_listeners.remove(l);
 }
 
+void Music::SetTuning(Tuning tuning)
+{
+	int i;
+	s_tuning=tuning;
+	switch (tuning) {
+	case CHROMATIC:
+		// Nothing to do
+		break;
+	case WERCKMEISTER3:
+		for (i = 0; i < 13; i += 1)
+		{
+			s_semitones[i] = semitones_werckmeister3[i];
+		}
+		break;
+	case KIRNBERGER3:
+		for (i = 0; i < 13; i += 1)
+		{
+			s_semitones[i] = semitones_kirnberger3[i];
+		}
+		break;
+	case DIATONIC:
+		for (i = 0; i < 13; i += 1)
+		{
+			s_semitones[i] = semitones_diatonic[i];
+		}
+		break;
+	case MEANTONE:
+		for (i = 0; i < 13; i += 1)
+		{
+			s_semitones[i] = semitones_meantone[i];
+		}
+		break;
+	}
+}
+
 void Music::SetSamplingRate(int sampling_rate)
 {
 	s_sampling_rate = sampling_rate;