[Ch14,15,16] Updating to use ShortMessage constants (8d9b8b35) · Commits · examples / Head First Java 3rd Edition

src/main/java/ch14/MiniMusicPlayer2.java

+8 −6

Changes for src/main/java/ch14/MiniMusicPlayer2.java: 8 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@ package ch14;

		import javax.sound.midi.*;

		import static javax.sound.midi.ShortMessage.*;

		public class MiniMusicPlayer2 implements ControllerEventListener {
		public static void main(String[] args) {
		MiniMusicPlayer2 mini = new MiniMusicPlayer2();
		@@ -20,9 +22,9 @@ public class MiniMusicPlayer2 implements ControllerEventListener {
		Track track = seq.createTrack();

		for (int i = 5; i < 60; i += 4) {
		track.add(makeEvent(144, 1, i, 100, i));
		track.add(makeEvent(176, 1, 127, 0, i));
		track.add(makeEvent(128, 1, i, 100, i + 2));
		track.add(makeEvent(NOTE_ON, 1, i, 100, i));
		track.add(makeEvent(CONTROL_CHANGE, 1, 127, 0, i));
		track.add(makeEvent(NOTE_OFF, 1, i, 100, i + 2));
		}

		sequencer.setSequence(seq);
		@@ -40,9 +42,9 @@ public class MiniMusicPlayer2 implements ControllerEventListener {
		public MidiEvent makeEvent(int comd, int chan, int one, int two, int tick) {
		MidiEvent event = null;
		try {
		ShortMessage a = new ShortMessage();
		a.setMessage(comd, chan, one, two);
		event = new MidiEvent(a, tick);
		ShortMessage msg = new ShortMessage();
		msg.setMessage(comd, chan, one, two);
		event = new MidiEvent(msg, tick);
		} catch (Exception e) {
		e.printStackTrace();
		}

+8 −6

Changes for src/main/java/ch14/MiniMusicPlayer3.java: 8 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@ import javax.swing.*;
		import java.awt.Color;
		import java.awt.Graphics;

		import static javax.sound.midi.ShortMessage.*;

		public class MiniMusicPlayer3 {
		private static JFrame f = new JFrame("My First Music Video");
		private static MyDrawPanel ml;
		@@ -35,9 +37,9 @@ public class MiniMusicPlayer3 {
		for (int i = 0; i < 60; i += 4) {

		r = (int) ((Math.random() * 50) + 1);
		track.add(makeEvent(144, 1, r, 100, i));
		track.add(makeEvent(176, 1, 127, 0, i));
		track.add(makeEvent(128, 1, r, 100, i + 2));
		track.add(makeEvent(NOTE_ON, 1, r, 100, i));
		track.add(makeEvent(CONTROL_CHANGE, 1, 127, 0, i));
		track.add(makeEvent(NOTE_OFF, 1, r, 100, i + 2));
		}

		sequencer.setSequence(seq);
		@@ -52,9 +54,9 @@ public class MiniMusicPlayer3 {
		public MidiEvent makeEvent(int comd, int chan, int one, int two, int tick) {
		MidiEvent event = null;
		try {
		ShortMessage a = new ShortMessage();
		a.setMessage(comd, chan, one, two);
		event = new MidiEvent(a, tick);
		ShortMessage msg = new ShortMessage();
		msg.setMessage(comd, chan, one, two);
		event = new MidiEvent(msg, tick);

		} catch (Exception e) {
		e.printStackTrace();

+7 −8

Changes for src/main/java/ch15/BeatBox.java: 7 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,13 +2,12 @@ package ch15;

		import javax.sound.midi.*;
		import javax.swing.*;
		import java.awt.BorderLayout;
		import java.awt.GridLayout;
		import java.awt.Label;
		import java.awt.event.ActionEvent;
		import java.awt.event.ActionListener;
		import java.awt.*;
		import java.awt.event.*;
		import java.util.ArrayList;

		import static javax.sound.midi.ShortMessage.*;


		public class BeatBox {
		private ArrayList<JCheckBox> checkboxList;
		@@ -119,7 +118,7 @@ public class BeatBox {
		}
		}
		makeTracks(trackList);
		track.add(makeEvent(176, 1, 127, 0, 16));
		track.add(makeEvent(CONTROL_CHANGE, 1, 127, 0, 16));
		}

		track.add(makeEvent(192, 9, 1, 0, 15));
		@@ -166,8 +165,8 @@ public class BeatBox {
		int key = list[i];

		if (key != 0) {
		track.add(makeEvent(144, 9, key, 100, i));
		track.add(makeEvent(128, 9, key, 100, i + 1));
		track.add(makeEvent(NOTE_ON, 9, key, 100, i));
		track.add(makeEvent(NOTE_OFF, 9, key, 100, i + 1));
		}
		}
		}

+5 −3

Changes for src/main/java/ch16/BeatBox.java: 5 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -9,6 +9,8 @@ import java.awt.event.ActionListener;
		import java.io.*;
		import java.util.ArrayList;

		import static javax.sound.midi.ShortMessage.*;

		public class BeatBox {
		private ArrayList<JCheckBox> checkboxList;
		private Sequencer sequencer;
		@@ -126,7 +128,7 @@ public class BeatBox {
		}
		}
		makeTracks(trackList);
		track.add(makeEvent(176, 1, 127, 0, 16));
		track.add(makeEvent(CONTROL_CHANGE, 1, 127, 0, 16));
		}

		track.add(makeEvent(192, 9, 1, 0, 15));
		@@ -172,8 +174,8 @@ public class BeatBox {
		int key = list[i];

		if (key != 0) {
		track.add(makeEvent(144, 9, key, 100, i));
		track.add(makeEvent(128, 9, key, 100, i + 1));
		track.add(makeEvent(NOTE_ON, 9, key, 100, i));
		track.add(makeEvent(NOTE_OFF, 9, key, 100, i + 1));
		}
		}
		}