Commit: 452a0fda039d31ebd4296ef49c5a352a93a596fc - MIDIChordHelperGO (git)

MIDI Chord Helper機能追加版（GOは五度圏や碁盤の「ご」。別に移動式じゃありません）

Commit MetaInfo

• Revisión: 452a0fda039d31ebd4296ef49c5a352a93a596fc (tree)
• Tiempo: 2022-11-15 02:13:20
• Autor: k-hatano <kent.ruffle.mgj626@gmai...>
• Commiter: k-hatano

Log Message

10チャンネル選択中にスクロールバーにカーソルを合わせた場合、各ノートに対応するパーカッションの頭文字を表示

Cambiar Resumen

• modified: src/camidion/chordhelper/music/MIDISpec.java
• modified: src/camidion/chordhelper/pianokeyboard/PianoKeyboard.java

Diferencia incremental

--- a/src/camidion/chordhelper/music/MIDISpec.java
+++ b/src/camidion/chordhelper/music/MIDISpec.java
@@ -614,7 +614,7 @@ public class MIDISpec {
 	/**
 	 * パーカッション用MIDIノート番号の最小値
 	 */
-	public static final int MIN_PERCUSSION_NUMBER = 35;
+	public static final int MIN_PERCUSSION_NUMBER = 27;
 
 	/**
 	 * パーカッション用のMIDIチャンネル（通常はCH.10）における
@@ -629,6 +629,14 @@ public class MIDISpec {
 	}
 
 	public static final String PERCUSSION_NAMES[] = {
+			"High Q",
+			"Slap 49",
+			"Scratch Push",
+			"Scratch Pull",
+			"Sticks",
+			"Square Click",
+			"Metronome Click",
+			"Metronome Bell",
 			"Acoustic Bass Drum",
 			"Bass Drum 1",
 			"Side Stick",

--- a/src/camidion/chordhelper/pianokeyboard/PianoKeyboard.java
+++ b/src/camidion/chordhelper/pianokeyboard/PianoKeyboard.java
@@ -146,6 +146,17 @@ public class PianoKeyboard extends JComponent {
 	private int[] modulations = new int[MIDISpec.MAX_CHANNELS];
 
 	int programs[] = new int[16];
+	
+	final String DRUM_LABELS[] = {
+		"", "", "", "", "", "", "", "", "", "", "", "",
+		"", "", "", "", "", "", "", "", "", "", "", "",
+		"", "", "", "Hq", "Sl", "Sc", "Sc", "St", "Ck", "Mm", "Mm", "Bs",
+		"Bs", "St", "Sn", "Cp", "Sn", "Tm", "Hh", "Tm", "Hh", "Tm", "Hh", "Tm",
+		"Tm", "Cy", "Tm", "Cy", "Cy", "Bl", "Tb", "Cy", "Bl", "Cy", "Sl", "Cy",
+		"Bg", "Bg", "Cg", "Cg", "Cg", "Tb", "Tb", "Ag", "Ag", "Cb", "Mr", "Wh",
+		"Wh", "Gr", "Gr", "Cv", "Wb", "Wb", "Cc", "Cc", "Tr", "Tr", "Sk", "Bl",
+		"Bt", "Cs", "Sd", "Sd", "", "", "", "", "", "", "", "",
+	};
 
 	private class MidiChannelStatus extends AbstractMidiChannelStatus {
 		public MidiChannelStatus(int channel) {
@@ -394,6 +405,16 @@ public class PianoKeyboard extends JComponent {
 			return true;
 		}
 
+		boolean paintDrumLabel(Graphics2D g2, int octave) {
+			String label = "";
+			int note = position + 12 * octave;
+			if (note >= 0 && note < DRUM_LABELS.length) {
+				label = DRUM_LABELS[note];
+			}
+			g2.drawString(label, x + width / 6, indicator.y - 2);
+			return true;
+		}
+
 		boolean paintIndicator(Graphics2D g2, boolean isSmall, int pitchBendValue) {
 			if (isSmall) {
 				g2.fillOval(
@@ -649,12 +670,21 @@ public class PianoKeyboard extends JComponent {
 					}
 				}));
 		if (showingOctave) {
-			// Show octave
-			Arrays.stream(keys).forEach(k -> {
-				g2.setColor(
-						k.isBlack ? Color.gray.brighter() : isDark ? getForeground() : getForeground().brighter());
-				k.paintKeyOctave(g2, octaveRangeModel.getValue());
-			});
+			if (midiChComboboxModel.getSelectedChannel() == 9) {
+				// Show drum labels
+				Arrays.stream(keys).forEach(k -> {
+					g2.setColor(
+							k.isBlack ? Color.gray.brighter() : isDark ? getForeground() : getForeground().brighter());
+					k.paintDrumLabel(g2, octaveRangeModel.getValue());
+				});
+			} else {
+				// Show octave
+				Arrays.stream(keys).forEach(k -> {
+					g2.setColor(
+							k.isBlack ? Color.gray.brighter() : isDark ? getForeground() : getForeground().brighter());
+					k.paintKeyOctave(g2, octaveRangeModel.getValue());
+				});
+			}
 		} else if (isFocusOwner()) {
 			// Show PC-key binding
 			Arrays.stream(bindedKeys).forEach(k -> {