diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2011-09-16 12:30:25 +0100 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2011-09-16 12:30:25 +0100 |
| commit | 2f9556e87d356051f412e73394833627347d848e (patch) | |
| tree | 59b21d062d5d5739cd17e73056cdcb8c6bc73de0 /PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java | |
| parent | 792fa79119050016b992f1947e93abdd17d0a6d3 (diff) | |
| parent | 8721d9014c86909910fbc9031e0c9e7668e49826 (diff) | |
| download | punchingbag-2f9556e87d356051f412e73394833627347d848e.tar punchingbag-2f9556e87d356051f412e73394833627347d848e.tar.gz | |
Fixed Noise and SimpleKeyboard.
Merge branch 'master' of gitorious.org:punchingbag/punchingbag
Conflicts:
PunchingBag/src/uk/ac/open/punchingbag/examples/SimpleKeyboard.java
Diffstat (limited to 'PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java')
| -rw-r--r-- | PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java b/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java index e03c4e6..2af7996 100644 --- a/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java +++ b/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java @@ -104,14 +104,14 @@ public class PunchingBagGUI implements MouseListener, MouseMotionListener, // Mixer mix = AudioSystem.getMixer(AudioSystem.getMixerInfo()[0]); try { - // bag.connectToArduinos(); + bag.connectToArduinos(); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } frame = new JFrame("Punching Bag GUI"); - frame.setUndecorated(true); + //frame.setUndecorated(true); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // frame.setSize(600, 600); |