Menu
▾
▴
modplug-svn-commit
|
From: <sv...@op...> - 2024-03-23 16:38:30
|
Author: sagamusix Date: Sat Mar 23 17:38:20 2024 New Revision: 20433 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20433 Log: Merged revision(s) 20224 from trunk/OpenMPT: [New] Add two more octaves worth of note key assignments suitable for micro-tuning (https://bugs.openmpt.org/view.php?id=1727). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/CommandSet.cpp branches/OpenMPT-1.31/mptrack/CommandSet.h branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp branches/OpenMPT-1.31/mptrack/TrackerSettings.h branches/OpenMPT-1.31/mptrack/View_pat.cpp Modified: branches/OpenMPT-1.31/mptrack/CommandSet.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/CommandSet.cpp Sat Mar 23 17:16:39 2024 (r20432) +++ branches/OpenMPT-1.31/mptrack/CommandSet.cpp Sat Mar 23 17:38:20 2024 (r20433) @@ -655,6 +655,32 @@ {1095, kcVPNoteG_2, _T("Base octave +2 G")}, {1096, kcVPNoteGS2, _T("Base octave +2 G#")}, {1097, kcVPNoteA_3, _T("Base octave +2 A")}, + {2070, kcVPNoteAS3, _T("Base octave +2 A#")}, + {2071, kcVPNoteB_3, _T("Base octave +2 B")}, + {2072, kcVPNoteC_3, _T("Base octave +3 C")}, + {2073, kcVPNoteCS3, _T("Base octave +3 C#")}, + {2074, kcVPNoteD_3, _T("Base octave +3 D")}, + {2075, kcVPNoteDS3, _T("Base octave +3 D#")}, + {2076, kcVPNoteE_3, _T("Base octave +3 E")}, + {2077, kcVPNoteF_3, _T("Base octave +3 F")}, + {2078, kcVPNoteFS3, _T("Base octave +3 F#")}, + {2079, kcVPNoteG_3, _T("Base octave +3 G")}, + {2080, kcVPNoteGS3, _T("Base octave +3 G#")}, + {2081, kcVPNoteA_4, _T("Base octave +3 A")}, + {2082, kcVPNoteAS4, _T("Base octave +3 A#")}, + {2083, kcVPNoteB_4, _T("Base octave +3 B")}, + {2084, kcVPNoteC_4, _T("Base octave +4 C")}, + {2085, kcVPNoteCS4, _T("Base octave +4 C#")}, + {2086, kcVPNoteD_4, _T("Base octave +4 D")}, + {2087, kcVPNoteDS4, _T("Base octave +4 D#")}, + {2088, kcVPNoteE_4, _T("Base octave +4 E")}, + {2089, kcVPNoteF_4, _T("Base octave +4 F")}, + {2090, kcVPNoteFS4, _T("Base octave +4 F#")}, + {2091, kcVPNoteG_4, _T("Base octave +4 G")}, + {2092, kcVPNoteGS4, _T("Base octave +4 G#")}, + {2093, kcVPNoteA_5, _T("Base octave +4 A")}, + {2094, kcVPNoteAS5, _T("Base octave +4 A#")}, + {2095, kcVPNoteB_5, _T("Base octave +4 B")}, {KeyCommand::Hidden, kcVPNoteStopC_0, _T("Stop base octave C")}, {KeyCommand::Hidden, kcVPNoteStopCS0, _T("Stop base octave C#")}, {KeyCommand::Hidden, kcVPNoteStopD_0, _T("Stop base octave D")}, @@ -664,9 +690,9 @@ {KeyCommand::Hidden, kcVPNoteStopFS0, _T("Stop base octave F#")}, {KeyCommand::Hidden, kcVPNoteStopG_0, _T("Stop base octave G")}, {KeyCommand::Hidden, kcVPNoteStopGS0, _T("Stop base octave G#")}, - {KeyCommand::Hidden, kcVPNoteStopA_1, _T("Stop base octave +1 A")}, - {KeyCommand::Hidden, kcVPNoteStopAS1, _T("Stop base octave +1 A#")}, - {KeyCommand::Hidden, kcVPNoteStopB_1, _T("Stop base octave +1 B")}, + {KeyCommand::Hidden, kcVPNoteStopA_1, _T("Stop base octave A")}, + {KeyCommand::Hidden, kcVPNoteStopAS1, _T("Stop base octave A#")}, + {KeyCommand::Hidden, kcVPNoteStopB_1, _T("Stop base octave B")}, {KeyCommand::Hidden, kcVPNoteStopC_1, _T("Stop base octave +1 C")}, {KeyCommand::Hidden, kcVPNoteStopCS1, _T("Stop base octave +1 C#")}, {KeyCommand::Hidden, kcVPNoteStopD_1, _T("Stop base octave +1 D")}, @@ -676,9 +702,9 @@ {KeyCommand::Hidden, kcVPNoteStopFS1, _T("Stop base octave +1 F#")}, {KeyCommand::Hidden, kcVPNoteStopG_1, _T("Stop base octave +1 G")}, {KeyCommand::Hidden, kcVPNoteStopGS1, _T("Stop base octave +1 G#")}, - {KeyCommand::Hidden, kcVPNoteStopA_2, _T("Stop base octave +2 A")}, - {KeyCommand::Hidden, kcVPNoteStopAS2, _T("Stop base octave +2 A#")}, - {KeyCommand::Hidden, kcVPNoteStopB_2, _T("Stop base octave +2 B")}, + {KeyCommand::Hidden, kcVPNoteStopA_2, _T("Stop base octave +1 A")}, + {KeyCommand::Hidden, kcVPNoteStopAS2, _T("Stop base octave +1 A#")}, + {KeyCommand::Hidden, kcVPNoteStopB_2, _T("Stop base octave +1 B")}, {KeyCommand::Hidden, kcVPNoteStopC_2, _T("Stop base octave +2 C")}, {KeyCommand::Hidden, kcVPNoteStopCS2, _T("Stop base octave +2 C#")}, {KeyCommand::Hidden, kcVPNoteStopD_2, _T("Stop base octave +2 D")}, @@ -688,7 +714,33 @@ {KeyCommand::Hidden, kcVPNoteStopFS2, _T("Stop base octave +2 F#")}, {KeyCommand::Hidden, kcVPNoteStopG_2, _T("Stop base octave +2 G")}, {KeyCommand::Hidden, kcVPNoteStopGS2, _T("Stop base octave +2 G#")}, - {KeyCommand::Hidden, kcVPNoteStopA_3, _T("Stop base octave +3 A")}, + {KeyCommand::Hidden, kcVPNoteStopA_3, _T("Stop base octave +2 A")}, + {KeyCommand::Hidden, kcVPNoteStopAS3, _T("Stop base octave +2 A#")}, + {KeyCommand::Hidden, kcVPNoteStopB_3, _T("Stop base octave +2 B")}, + {KeyCommand::Hidden, kcVPNoteStopC_3, _T("Stop base octave +3 C")}, + {KeyCommand::Hidden, kcVPNoteStopCS3, _T("Stop base octave +3 C#")}, + {KeyCommand::Hidden, kcVPNoteStopD_3, _T("Stop base octave +3 D")}, + {KeyCommand::Hidden, kcVPNoteStopDS3, _T("Stop base octave +3 D#")}, + {KeyCommand::Hidden, kcVPNoteStopE_3, _T("Stop base octave +3 E")}, + {KeyCommand::Hidden, kcVPNoteStopF_3, _T("Stop base octave +3 F")}, + {KeyCommand::Hidden, kcVPNoteStopFS3, _T("Stop base octave +3 F#")}, + {KeyCommand::Hidden, kcVPNoteStopG_3, _T("Stop base octave +3 G")}, + {KeyCommand::Hidden, kcVPNoteStopGS3, _T("Stop base octave +3 G#")}, + {KeyCommand::Hidden, kcVPNoteStopA_4, _T("Stop base octave +3 A")}, + {KeyCommand::Hidden, kcVPNoteStopAS4, _T("Stop base octave +3 A#")}, + {KeyCommand::Hidden, kcVPNoteStopB_4, _T("Stop base octave +3 B")}, + {KeyCommand::Hidden, kcVPNoteStopC_4, _T("Stop base octave +4 C")}, + {KeyCommand::Hidden, kcVPNoteStopCS4, _T("Stop base octave +4 C#")}, + {KeyCommand::Hidden, kcVPNoteStopD_4, _T("Stop base octave +4 D")}, + {KeyCommand::Hidden, kcVPNoteStopDS4, _T("Stop base octave +4 D#")}, + {KeyCommand::Hidden, kcVPNoteStopE_4, _T("Stop base octave +4 E")}, + {KeyCommand::Hidden, kcVPNoteStopF_4, _T("Stop base octave +4 F")}, + {KeyCommand::Hidden, kcVPNoteStopFS4, _T("Stop base octave +4 F#")}, + {KeyCommand::Hidden, kcVPNoteStopG_4, _T("Stop base octave +4 G")}, + {KeyCommand::Hidden, kcVPNoteStopGS4, _T("Stop base octave +4 G#")}, + {KeyCommand::Hidden, kcVPNoteStopA_5, _T("Stop base octave +4 A")}, + {KeyCommand::Hidden, kcVPNoteStopAS5, _T("Stop base octave +4 A#")}, + {KeyCommand::Hidden, kcVPNoteStopB_5, _T("Stop base octave +4 B")}, {KeyCommand::Hidden, kcVPChordC_0, _T("Base octave chord C")}, {KeyCommand::Hidden, kcVPChordCS0, _T("Base octave chord C#")}, {KeyCommand::Hidden, kcVPChordD_0, _T("Base octave chord D")}, @@ -698,9 +750,9 @@ {KeyCommand::Hidden, kcVPChordFS0, _T("Base octave chord F#")}, {KeyCommand::Hidden, kcVPChordG_0, _T("Base octave chord G")}, {KeyCommand::Hidden, kcVPChordGS0, _T("Base octave chord G#")}, - {KeyCommand::Hidden, kcVPChordA_1, _T("Base octave +1 chord A")}, - {KeyCommand::Hidden, kcVPChordAS1, _T("Base octave +1 chord A#")}, - {KeyCommand::Hidden, kcVPChordB_1, _T("Base octave +1 chord B")}, + {KeyCommand::Hidden, kcVPChordA_1, _T("Base octave chord A")}, + {KeyCommand::Hidden, kcVPChordAS1, _T("Base octave chord A#")}, + {KeyCommand::Hidden, kcVPChordB_1, _T("Base octave chord B")}, {KeyCommand::Hidden, kcVPChordC_1, _T("Base octave +1 chord C")}, {KeyCommand::Hidden, kcVPChordCS1, _T("Base octave +1 chord C#")}, {KeyCommand::Hidden, kcVPChordD_1, _T("Base octave +1 chord D")}, @@ -710,9 +762,9 @@ {KeyCommand::Hidden, kcVPChordFS1, _T("Base octave +1 chord F#")}, {KeyCommand::Hidden, kcVPChordG_1, _T("Base octave +1 chord G")}, {KeyCommand::Hidden, kcVPChordGS1, _T("Base octave +1 chord G#")}, - {KeyCommand::Hidden, kcVPChordA_2, _T("Base octave +2 chord A")}, - {KeyCommand::Hidden, kcVPChordAS2, _T("Base octave +2 chord A#")}, - {KeyCommand::Hidden, kcVPChordB_2, _T("Base octave +2 chord B")}, + {KeyCommand::Hidden, kcVPChordA_2, _T("Base octave +1 chord A")}, + {KeyCommand::Hidden, kcVPChordAS2, _T("Base octave +1 chord A#")}, + {KeyCommand::Hidden, kcVPChordB_2, _T("Base octave +1 chord B")}, {KeyCommand::Hidden, kcVPChordC_2, _T("Base octave +2 chord C")}, {KeyCommand::Hidden, kcVPChordCS2, _T("Base octave +2 chord C#")}, {KeyCommand::Hidden, kcVPChordD_2, _T("Base octave +2 chord D")}, @@ -722,7 +774,33 @@ {KeyCommand::Hidden, kcVPChordFS2, _T("Base octave +2 chord F#")}, {KeyCommand::Hidden, kcVPChordG_2, _T("Base octave +2 chord G")}, {KeyCommand::Hidden, kcVPChordGS2, _T("Base octave +2 chord G#")}, - {KeyCommand::Hidden, kcVPChordA_3, _T("Base octave chord +3 A")}, + {KeyCommand::Hidden, kcVPChordA_3, _T("Base octave +2 chord A")}, + {KeyCommand::Hidden, kcVPChordAS3, _T("Base octave +2 chord A#")}, + {KeyCommand::Hidden, kcVPChordB_3, _T("Base octave +2 chord B")}, + {KeyCommand::Hidden, kcVPChordC_3, _T("Base octave +3 chord C")}, + {KeyCommand::Hidden, kcVPChordCS3, _T("Base octave +3 chord C#")}, + {KeyCommand::Hidden, kcVPChordD_3, _T("Base octave +3 chord D")}, + {KeyCommand::Hidden, kcVPChordDS3, _T("Base octave +3 chord D#")}, + {KeyCommand::Hidden, kcVPChordE_3, _T("Base octave +3 chord E")}, + {KeyCommand::Hidden, kcVPChordF_3, _T("Base octave +3 chord F")}, + {KeyCommand::Hidden, kcVPChordFS3, _T("Base octave +3 chord F#")}, + {KeyCommand::Hidden, kcVPChordG_3, _T("Base octave +3 chord G")}, + {KeyCommand::Hidden, kcVPChordGS3, _T("Base octave +3 chord G#")}, + {KeyCommand::Hidden, kcVPChordA_4, _T("Base octave +3 chord A")}, + {KeyCommand::Hidden, kcVPChordAS4, _T("Base octave +3 chord A#")}, + {KeyCommand::Hidden, kcVPChordB_4, _T("Base octave +3 chord B")}, + {KeyCommand::Hidden, kcVPChordC_4, _T("Base octave +4 chord C")}, + {KeyCommand::Hidden, kcVPChordCS4, _T("Base octave +4 chord C#")}, + {KeyCommand::Hidden, kcVPChordD_4, _T("Base octave +4 chord D")}, + {KeyCommand::Hidden, kcVPChordDS4, _T("Base octave +4 chord D#")}, + {KeyCommand::Hidden, kcVPChordE_4, _T("Base octave +4 chord E")}, + {KeyCommand::Hidden, kcVPChordF_4, _T("Base octave +4 chord F")}, + {KeyCommand::Hidden, kcVPChordFS4, _T("Base octave +4 chord F#")}, + {KeyCommand::Hidden, kcVPChordG_4, _T("Base octave +4 chord G")}, + {KeyCommand::Hidden, kcVPChordGS4, _T("Base octave +4 chord G#")}, + {KeyCommand::Hidden, kcVPChordA_5, _T("Base octave +4 chord A")}, + {KeyCommand::Hidden, kcVPChordAS5, _T("Base octave +4 chord A#")}, + {KeyCommand::Hidden, kcVPChordB_5, _T("Base octave +4 chord B")}, {KeyCommand::Hidden, kcVPChordStopC_0, _T("Stop base octave chord C")}, {KeyCommand::Hidden, kcVPChordStopCS0, _T("Stop base octave chord C#")}, {KeyCommand::Hidden, kcVPChordStopD_0, _T("Stop base octave chord D")}, @@ -732,9 +810,9 @@ {KeyCommand::Hidden, kcVPChordStopFS0, _T("Stop base octave chord F#")}, {KeyCommand::Hidden, kcVPChordStopG_0, _T("Stop base octave chord G")}, {KeyCommand::Hidden, kcVPChordStopGS0, _T("Stop base octave chord G#")}, - {KeyCommand::Hidden, kcVPChordStopA_1, _T("Stop base octave +1 chord A")}, - {KeyCommand::Hidden, kcVPChordStopAS1, _T("Stop base octave +1 chord A#")}, - {KeyCommand::Hidden, kcVPChordStopB_1, _T("Stop base octave +1 chord B")}, + {KeyCommand::Hidden, kcVPChordStopA_1, _T("Stop base octave chord A")}, + {KeyCommand::Hidden, kcVPChordStopAS1, _T("Stop base octave chord A#")}, + {KeyCommand::Hidden, kcVPChordStopB_1, _T("Stop base octave chord B")}, {KeyCommand::Hidden, kcVPChordStopC_1, _T("Stop base octave +1 chord C")}, {KeyCommand::Hidden, kcVPChordStopCS1, _T("Stop base octave +1 chord C#")}, {KeyCommand::Hidden, kcVPChordStopD_1, _T("Stop base octave +1 chord D")}, @@ -744,9 +822,9 @@ {KeyCommand::Hidden, kcVPChordStopFS1, _T("Stop base octave +1 chord F#")}, {KeyCommand::Hidden, kcVPChordStopG_1, _T("Stop base octave +1 chord G")}, {KeyCommand::Hidden, kcVPChordStopGS1, _T("Stop base octave +1 chord G#")}, - {KeyCommand::Hidden, kcVPChordStopA_2, _T("Stop base octave +2 chord A")}, - {KeyCommand::Hidden, kcVPChordStopAS2, _T("Stop base octave +2 chord A#")}, - {KeyCommand::Hidden, kcVPChordStopB_2, _T("Stop base octave +2 chord B")}, + {KeyCommand::Hidden, kcVPChordStopA_2, _T("Stop base octave +1 chord A")}, + {KeyCommand::Hidden, kcVPChordStopAS2, _T("Stop base octave +1 chord A#")}, + {KeyCommand::Hidden, kcVPChordStopB_2, _T("Stop base octave +1 chord B")}, {KeyCommand::Hidden, kcVPChordStopC_2, _T("Stop base octave +2 chord C")}, {KeyCommand::Hidden, kcVPChordStopCS2, _T("Stop base octave +2 chord C#")}, {KeyCommand::Hidden, kcVPChordStopD_2, _T("Stop base octave +2 chord D")}, @@ -756,7 +834,33 @@ {KeyCommand::Hidden, kcVPChordStopFS2, _T("Stop base octave +2 chord F#")}, {KeyCommand::Hidden, kcVPChordStopG_2, _T("Stop base octave +2 chord G")}, {KeyCommand::Hidden, kcVPChordStopGS2, _T("Stop base octave +2 chord G#")}, - {KeyCommand::Hidden, kcVPChordStopA_3, _T("Stop base octave +3 chord A")}, + {KeyCommand::Hidden, kcVPChordStopA_3, _T("Stop base octave +2 chord A")}, + {KeyCommand::Hidden, kcVPChordStopAS3, _T("Stop base octave +2 chord A#")}, + {KeyCommand::Hidden, kcVPChordStopB_3, _T("Stop base octave +2 chord B")}, + {KeyCommand::Hidden, kcVPChordStopC_3, _T("Stop base octave +3 chord C")}, + {KeyCommand::Hidden, kcVPChordStopCS3, _T("Stop base octave +3 chord C#")}, + {KeyCommand::Hidden, kcVPChordStopD_3, _T("Stop base octave +3 chord D")}, + {KeyCommand::Hidden, kcVPChordStopDS3, _T("Stop base octave +3 chord D#")}, + {KeyCommand::Hidden, kcVPChordStopE_3, _T("Stop base octave +3 chord E")}, + {KeyCommand::Hidden, kcVPChordStopF_3, _T("Stop base octave +3 chord F")}, + {KeyCommand::Hidden, kcVPChordStopFS3, _T("Stop base octave +3 chord F#")}, + {KeyCommand::Hidden, kcVPChordStopG_3, _T("Stop base octave +3 chord G")}, + {KeyCommand::Hidden, kcVPChordStopGS3, _T("Stop base octave +3 chord G#")}, + {KeyCommand::Hidden, kcVPChordStopA_4, _T("Stop base octave +3 chord A")}, + {KeyCommand::Hidden, kcVPChordStopAS4, _T("Stop base octave +3 chord A#")}, + {KeyCommand::Hidden, kcVPChordStopB_4, _T("Stop base octave +3 chord B")}, + {KeyCommand::Hidden, kcVPChordStopC_4, _T("Stop base octave +4 chord C")}, + {KeyCommand::Hidden, kcVPChordStopCS4, _T("Stop base octave +4 chord C#")}, + {KeyCommand::Hidden, kcVPChordStopD_4, _T("Stop base octave +4 chord D")}, + {KeyCommand::Hidden, kcVPChordStopDS4, _T("Stop base octave +4 chord D#")}, + {KeyCommand::Hidden, kcVPChordStopE_4, _T("Stop base octave +4 chord E")}, + {KeyCommand::Hidden, kcVPChordStopF_4, _T("Stop base octave +4 chord F")}, + {KeyCommand::Hidden, kcVPChordStopFS4, _T("Stop base octave +4 chord F#")}, + {KeyCommand::Hidden, kcVPChordStopG_4, _T("Stop base octave +4 chord G")}, + {KeyCommand::Hidden, kcVPChordStopGS4, _T("Stop base octave +4 chord G#")}, + {KeyCommand::Hidden, kcVPChordStopA_5, _T("Stop base octave +4 chord A")}, + {KeyCommand::Hidden, kcVPChordStopAS5, _T("Stop base octave +4 chord A#")}, + {KeyCommand::Hidden, kcVPChordStopB_5, _T("Stop base octave +4 chord B")}, {1200, kcNoteCut, _T("Note Cut")}, {1201, kcNoteOff, _T("Note Off")}, {1202, kcSetIns0, _T("Set instrument digit 0")}, Modified: branches/OpenMPT-1.31/mptrack/CommandSet.h ============================================================================== --- branches/OpenMPT-1.31/mptrack/CommandSet.h Sat Mar 23 17:16:39 2024 (r20432) +++ branches/OpenMPT-1.31/mptrack/CommandSet.h Sat Mar 23 17:38:20 2024 (r20433) @@ -65,7 +65,7 @@ enum CommandID { - kcCommandSetNumNotes = 33, // kcVPEndNotes - kcVPStartNotes + kcCommandSetNumNotes = 59, // kcVPEndNotes - kcVPStartNotes kcNull = -1, kcFirst, @@ -433,7 +433,33 @@ kcVPNoteG_2, kcVPNoteGS2, kcVPNoteA_3, - kcVPEndNotes = kcVPNoteA_3, + kcVPNoteAS3, + kcVPNoteB_3, + kcVPNoteC_3, + kcVPNoteCS3, + kcVPNoteD_3, + kcVPNoteDS3, + kcVPNoteE_3, + kcVPNoteF_3, + kcVPNoteFS3, + kcVPNoteG_3, + kcVPNoteGS3, + kcVPNoteA_4, + kcVPNoteAS4, + kcVPNoteB_4, + kcVPNoteC_4, + kcVPNoteCS4, + kcVPNoteD_4, + kcVPNoteDS4, + kcVPNoteE_4, + kcVPNoteF_4, + kcVPNoteFS4, + kcVPNoteG_4, + kcVPNoteGS4, + kcVPNoteA_5, + kcVPNoteAS5, + kcVPNoteB_5, + kcVPEndNotes = kcVPNoteB_5, //Note stops kcVPStartNoteStops, @@ -471,7 +497,33 @@ kcVPNoteStopG_2, kcVPNoteStopGS2, kcVPNoteStopA_3, - kcVPEndNoteStops = kcVPNoteStopA_3, + kcVPNoteStopAS3, + kcVPNoteStopB_3, + kcVPNoteStopC_3, + kcVPNoteStopCS3, + kcVPNoteStopD_3, + kcVPNoteStopDS3, + kcVPNoteStopE_3, + kcVPNoteStopF_3, + kcVPNoteStopFS3, + kcVPNoteStopG_3, + kcVPNoteStopGS3, + kcVPNoteStopA_4, + kcVPNoteStopAS4, + kcVPNoteStopB_4, + kcVPNoteStopC_4, + kcVPNoteStopCS4, + kcVPNoteStopD_4, + kcVPNoteStopDS4, + kcVPNoteStopE_4, + kcVPNoteStopF_4, + kcVPNoteStopFS4, + kcVPNoteStopG_4, + kcVPNoteStopGS4, + kcVPNoteStopA_5, + kcVPNoteStopAS5, + kcVPNoteStopB_5, + kcVPEndNoteStops = kcVPNoteStopB_5, //Chords kcVPStartChords, @@ -509,7 +561,33 @@ kcVPChordG_2, kcVPChordGS2, kcVPChordA_3, - kcVPEndChords = kcVPChordA_3, + kcVPChordAS3, + kcVPChordB_3, + kcVPChordC_3, + kcVPChordCS3, + kcVPChordD_3, + kcVPChordDS3, + kcVPChordE_3, + kcVPChordF_3, + kcVPChordFS3, + kcVPChordG_3, + kcVPChordGS3, + kcVPChordA_4, + kcVPChordAS4, + kcVPChordB_4, + kcVPChordC_4, + kcVPChordCS4, + kcVPChordD_4, + kcVPChordDS4, + kcVPChordE_4, + kcVPChordF_4, + kcVPChordFS4, + kcVPChordG_4, + kcVPChordGS4, + kcVPChordA_5, + kcVPChordAS5, + kcVPChordB_5, + kcVPEndChords = kcVPChordA_5, //Chord Stops kcVPStartChordStops, @@ -547,7 +625,33 @@ kcVPChordStopG_2, kcVPChordStopGS2, kcVPChordStopA_3, - kcVPEndChordStops = kcVPChordStopA_3, + kcVPChordStopAS3, + kcVPChordStopB_3, + kcVPChordStopC_3, + kcVPChordStopCS3, + kcVPChordStopD_3, + kcVPChordStopDS3, + kcVPChordStopE_3, + kcVPChordStopF_3, + kcVPChordStopFS3, + kcVPChordStopG_3, + kcVPChordStopGS3, + kcVPChordStopA_4, + kcVPChordStopAS4, + kcVPChordStopB_4, + kcVPChordStopC_4, + kcVPChordStopCS4, + kcVPChordStopD_4, + kcVPChordStopDS4, + kcVPChordStopE_4, + kcVPChordStopF_4, + kcVPChordStopFS4, + kcVPChordStopG_4, + kcVPChordStopGS4, + kcVPChordStopA_5, + kcVPChordStopAS5, + kcVPChordStopB_5, + kcVPEndChordStops = kcVPChordStopB_5, //Set octave from note column kcSetOctave0, Modified: branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp Sat Mar 23 17:16:39 2024 (r20432) +++ branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp Sat Mar 23 17:38:20 2024 (r20433) @@ -404,26 +404,26 @@ // init old and messy stuff: // Default chords - MemsetZero(Chords); - for(UINT ichord = 0; ichord < 3 * 12; ichord++) + for(size_t i = 0; i < Chords.size(); i++) { - Chords[ichord].key = (uint8)ichord; - Chords[ichord].notes[0] = MPTChord::noNote; - Chords[ichord].notes[1] = MPTChord::noNote; - Chords[ichord].notes[2] = MPTChord::noNote; + mpt::reset(Chords[i]); + Chords[i].key = static_cast<uint8>(i); + Chords[i].notes[0] = MPTChord::noNote; + Chords[i].notes[1] = MPTChord::noNote; + Chords[i].notes[2] = MPTChord::noNote; - if(ichord < 12) + if(i < 12) { // Major Chords - Chords[ichord].notes[0] = (int8)(ichord + 4); - Chords[ichord].notes[1] = (int8)(ichord + 7); - Chords[ichord].notes[2] = (int8)(ichord + 10); - } else if(ichord < 24) + Chords[i].notes[0] = static_cast<int8>(i + 4); + Chords[i].notes[1] = static_cast<int8>(i + 7); + Chords[i].notes[2] = static_cast<int8>(i + 10); + } else if(i < 24) { // Minor Chords - Chords[ichord].notes[0] = (int8)(ichord - 9); - Chords[ichord].notes[1] = (int8)(ichord - 5); - Chords[ichord].notes[2] = (int8)(ichord - 2); + Chords[i].notes[0] = static_cast<int8>(i - 9); + Chords[i].notes[1] = static_cast<int8>(i - 5); + Chords[i].notes[2] = static_cast<int8>(i - 2); } } @@ -1406,7 +1406,7 @@ void TrackerSettings::LoadChords(MPTChords &chords) { - for(std::size_t i = 0; i < std::size(chords); i++) + for(std::size_t i = 0; i < chords.size(); i++) { uint32 chord; mpt::ustring noteName = MPT_UFORMAT("{}{}")(mpt::ustring(NoteNamesSharp[i % 12]), i / 12); @@ -1435,7 +1435,7 @@ void TrackerSettings::SaveChords(MPTChords &chords) { - for(std::size_t i = 0; i < std::size(chords); i++) + for(std::size_t i = 0; i < chords.size(); i++) { auto notes = chords[i].notes; for(auto ¬e : notes) Modified: branches/OpenMPT-1.31/mptrack/TrackerSettings.h ============================================================================== --- branches/OpenMPT-1.31/mptrack/TrackerSettings.h Sat Mar 23 17:16:39 2024 (r20432) +++ branches/OpenMPT-1.31/mptrack/TrackerSettings.h Sat Mar 23 17:38:20 2024 (r20433) @@ -209,7 +209,7 @@ std::array<NoteType, notesPerChord - 1> notes; // Additional chord notes }; -using MPTChords = std::array<MPTChord, 3 * 12>; // 3 octaves +using MPTChords = std::array<MPTChord, 60>; // Size == kcCommandSetNumNotes // MIDI recording enum RecordAftertouchOptions Modified: branches/OpenMPT-1.31/mptrack/View_pat.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/View_pat.cpp Sat Mar 23 17:16:39 2024 (r20432) +++ branches/OpenMPT-1.31/mptrack/View_pat.cpp Sat Mar 23 17:38:20 2024 (r20433) @@ -5649,6 +5649,7 @@ { const MPTChords &chords = TrackerSettings::GetChords(); UINT chordNum = note - GetBaseNote(); + static_assert(mpt::extent<decltype(chords)>() == kcCommandSetNumNotes + 1); if(chordNum >= chords.size()) { |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X