diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2011-10-10 09:34:20 +0100 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2011-10-10 09:34:20 +0100 |
| commit | c34f84af6108c17cdf451a5162bf9fa9709d19f0 (patch) | |
| tree | 2b9a6b2eda951413d26fa4ea768f5ffcad29ef55 /PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java | |
| parent | c908ca694912508ac3d937d66a2316d6402cc379 (diff) | |
| parent | bc1c9a0736d0eb5198eb1fe481812976a70b6591 (diff) | |
| download | punchingbag-c34f84af6108c17cdf451a5162bf9fa9709d19f0.tar punchingbag-c34f84af6108c17cdf451a5162bf9fa9709d19f0.tar.gz | |
Merge branch 'graphics' into dev
Diffstat (limited to 'PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java')
| -rw-r--r-- | PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java b/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java index f76c033..f6cebe2 100644 --- a/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java +++ b/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java @@ -54,6 +54,7 @@ import javax.sound.sampled.AudioFormat.Encoding; import javax.sound.sampled.Mixer.Info; import uk.ac.open.punchingbag.examples.Keyboard; +import uk.ac.open.punchingbag.examples.MidiSequencer; import uk.ac.open.punchingbag.examples.SimpleKeyboard; import PicHelper.ImagePanel; @@ -95,7 +96,8 @@ public class PunchingBagGUI implements MouseListener, MouseMotionListener, public static void main(String[] args) throws InterruptedException { new PunchingBagGUI(); - new Keyboard(); + //new Keyboard(); + new MidiSequencer(); } PunchingBagGUI() throws InterruptedException { @@ -112,7 +114,7 @@ public class PunchingBagGUI implements MouseListener, MouseMotionListener, } frame = new JFrame("Punching Bag GUI"); - frame.setUndecorated(true); + //frame.setUndecorated(true); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // frame.setSize(600, 600); @@ -156,7 +158,7 @@ public class PunchingBagGUI implements MouseListener, MouseMotionListener, device = GraphicsEnvironment.getLocalGraphicsEnvironment() .getDefaultScreenDevice(); if (device.isFullScreenSupported()) { - device.setFullScreenWindow(frame); + //device.setFullScreenWindow(frame); } else { System.err.println("Full screen not supported"); } |