From f7f2bc3cfec4be475890c0be4598cf002c8646bf Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Wed, 25 Nov 2020 09:28:53 -0700 Subject: [PATCH] Make tuning.h easier to read --- tuning.h | 126 ++++++++----------------------------------------------- 1 file changed, 18 insertions(+), 108 deletions(-) diff --git a/tuning.h b/tuning.h index bcb54a5..a2f6375 100644 --- a/tuning.h +++ b/tuning.h @@ -7,115 +7,25 @@ enum TuningSystem { TUNINGSYSTEM_MAX = TUNINGSYSTEM_EQUAL, }; +// Twelve-Tone Note (one chromatic scale) +#define NOTE_TT(o) NOTE_C##o, NOTE_Cs##o, NOTE_Db##o = NOTE_Cs##o, \ + NOTE_D##o, NOTE_Ds##o, NOTE_Eb##o = NOTE_Ds##o, \ + NOTE_E##o, \ + NOTE_F##o, NOTE_Fs##o, NOTE_Gb##o = NOTE_Fs##o, \ + NOTE_G##o, NOTE_Gs##o, NOTE_Ab##o = NOTE_Gs##o, \ + NOTE_A##o, NOTE_As##o, NOTE_Bb##o = NOTE_As##o, \ + NOTE_B##o + enum Note { - NOTE_C0, - NOTE_CS0, - NOTE_D0, - NOTE_DS0, - NOTE_E0, - NOTE_F0, - NOTE_FS0, - NOTE_G0, - NOTE_GS0, - NOTE_A0, - NOTE_AS0, - NOTE_B0, - NOTE_C1, - NOTE_CS1, - NOTE_D1, - NOTE_DS1, - NOTE_E1, - NOTE_F1, - NOTE_FS1, - NOTE_G1, - NOTE_GS1, - NOTE_A1, - NOTE_AS1, - NOTE_B1, - NOTE_C2, - NOTE_CS2, - NOTE_D2, - NOTE_DS2, - NOTE_E2, - NOTE_F2, - NOTE_FS2, - NOTE_G2, - NOTE_GS2, - NOTE_A2, - NOTE_AS2, - NOTE_B2, - NOTE_C3, - NOTE_CS3, - NOTE_D3, - NOTE_DS3, - NOTE_E3, - NOTE_F3, - NOTE_FS3, - NOTE_G3, - NOTE_GS3, - NOTE_A3, - NOTE_AS3, - NOTE_B3, - NOTE_C4, - NOTE_CS4, - NOTE_D4, - NOTE_DS4, - NOTE_E4, - NOTE_F4, - NOTE_FS4, - NOTE_G4, - NOTE_GS4, - NOTE_A4, - NOTE_AS4, - NOTE_B4, - NOTE_C5, - NOTE_CS5, - NOTE_D5, - NOTE_DS5, - NOTE_E5, - NOTE_F5, - NOTE_FS5, - NOTE_G5, - NOTE_GS5, - NOTE_A5, - NOTE_AS5, - NOTE_B5, - NOTE_C6, - NOTE_CS6, - NOTE_D6, - NOTE_DS6, - NOTE_E6, - NOTE_F6, - NOTE_FS6, - NOTE_G6, - NOTE_GS6, - NOTE_A6, - NOTE_AS6, - NOTE_B6, - NOTE_C7, - NOTE_CS7, - NOTE_D7, - NOTE_DS7, - NOTE_E7, - NOTE_F7, - NOTE_FS7, - NOTE_G7, - NOTE_GS7, - NOTE_A7, - NOTE_AS7, - NOTE_B7, - NOTE_C8, - NOTE_CS8, - NOTE_D8, - NOTE_DS8, - NOTE_E8, - NOTE_F8, - NOTE_FS8, - NOTE_G8, - NOTE_GS8, - NOTE_A8, - NOTE_AS8, - NOTE_B8, + NOTE_TT(0), + NOTE_TT(1), + NOTE_TT(2), + NOTE_TT(3), + NOTE_TT(4), + NOTE_TT(5), + NOTE_TT(6), + NOTE_TT(7), + NOTE_TT(8), NOTE_ZERO = 0, NOTE_SEMITONE = 1, NOTE_WHOLETONE = 2,