Fixing a bug with the key configuration process. Refactoring.

tarehart · Oct 5, 2013 · c42f470 · c42f470
1 parent 5be06ac
commit c42f470
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 44 deletions.
diff --git a/src/tarehart/alter/AlterForm.java b/src/tarehart/alter/AlterForm.java
@@ -15,7 +15,7 @@
 public class AlterForm {
 
     private static final int MAX_VOLUME = 400;
-    private static final int GRACE_PERIOD = 1000; // 1000 milliseconds = 1 second
+    private static final int GRACE_PERIOD = 500; // 1000 milliseconds = 1 second
     private static final int DEFAULT_THRESHOLD = 50;
     private static final String CONFIG_THRESHOLD = "threshold";
     private static final String CONFIG_KEY_CODE = "keyCode";
@@ -27,20 +27,21 @@ public class AlterForm {
 
     public AlterForm() throws AWTException {
 
-        microphoneAnalyzer = new MicrophoneAnalyzer();
-        setupMicrophones();
+        populateMicrophoneCombo();
 
+        microphoneAnalyzer = new MicrophoneAnalyzer();
         presser = new KeyPresser();
         judge = new TalkingJudge(presser, GRACE_PERIOD);
-        presser.setKey(KeyEvent.VK_ALT);
-        spinner1.setValue(KeyEvent.VK_ALT);
-
-        setupKeyBinder();
 
         progressBar1.setMaximum(MAX_VOLUME);
         slider1.setMaximum(MAX_VOLUME);
 
-        readFromPreferences();
+        setUIFromPreferences();
+
+        setMicrophoneFromUI();
+        setKeyFromUI();
+
+        addUIListeners();
 
         microphoneAnalyzer.addListener(new AmplitudeUpdateListener() {
             @Override
@@ -60,17 +61,46 @@ public void amplitudeUpdated(float newAmplitude) {
             }
         });
 
+    }
 
+    private void addUIListeners() {
         spinner1.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
-                presser.setKey((Integer) spinner1.getValue());
+                setKeyFromUI();
+            }
+        });
+
+        comboBox1.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                if (e.getStateChange() == ItemEvent.SELECTED) {
+                    setMicrophoneFromUI();
+                }
+            }
+        });
+
+        button1.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                KeyGrabber.grabNextKey(spinner1);
             }
         });
+    }
+
+    private void setKeyFromUI() {
+        presser.setKey((Integer) spinner1.getValue());
+    }
 
+    private void setMicrophoneFromUI() {
+        try {
+            microphoneAnalyzer.setMixer((Mixer.Info) comboBox1.getSelectedItem());
+        } catch (LineUnavailableException e) {
+            e.printStackTrace();
+        }
     }
 
-    private void readFromPreferences() {
+    private void setUIFromPreferences() {
 
         slider1.setValue(preferences.getInt(CONFIG_THRESHOLD, DEFAULT_THRESHOLD));
         spinner1.setValue(preferences.getInt(CONFIG_KEY_CODE, KeyEvent.VK_ALT));
@@ -84,16 +114,7 @@ private void savePreferences() {
         preferences.putInt(CONFIG_MIC_CHOICE, comboBox1.getSelectedIndex());
     }
 
-    private void setupKeyBinder() {
-        button1.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                KeyGrabber.grabNextKey(spinner1);
-            }
-        });
-    }
-
-    private void setupMicrophones() {
+    private void populateMicrophoneCombo() {
 
         comboBox1.setRenderer(new ListCellRenderer() {
             @Override
@@ -109,25 +130,6 @@ public Component getListCellRendererComponent(JList list, Object value, int inde
             comboBox1.addItem(mixer);
         }
 
-        try {
-            microphoneAnalyzer.setMixer(comboBox1.getItemAt(0));
-        } catch (LineUnavailableException e) {
-            e.printStackTrace();
-        }
-
-        comboBox1.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                if (e.getStateChange() == ItemEvent.SELECTED) {
-                    Mixer.Info mixer = (Mixer.Info) e.getItem();
-                    try {
-                        microphoneAnalyzer.setMixer(mixer);
-                    } catch (LineUnavailableException e1) {
-                        e1.printStackTrace();
-                    }
-                }
-            }
-        });
     }
 
 
@@ -184,7 +186,7 @@ public static void main(String[] args) {
             frame.pack();
             frame.setLocationRelativeTo(null);
             frame.setVisible(true);
-        } catch (AWTException e) {
+        } catch (Throwable e) {
             e.printStackTrace();
         }
 

diff --git a/src/tarehart/alter/MicrophoneAnalyzer.java b/src/tarehart/alter/MicrophoneAnalyzer.java
@@ -80,7 +80,7 @@ public void stop() {
     class CaptureThread extends Thread{
 
         //An arbitrary-size temporary holding buffer
-        byte tempBuffer[] = new byte[100];
+        byte tempBuffer[] = new byte[250];
         public void run(){
 
             threadEnded = false;
@@ -94,13 +94,14 @@ public void run(){
                             aul.amplitudeUpdated(currentLevel);
                         }
                     }
+
                 }
 
                 microphone.close();
                 threadEnded = true;
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 System.out.println(e);
-                System.exit(0);
+                System.exit(-1);
             }
         }
     }

diff --git a/src/tarehart/alter/TalkingJudge.java b/src/tarehart/alter/TalkingJudge.java
@@ -11,7 +11,7 @@ public class TalkingJudge {
     private KeyPresser presser;
     private Timer timer;
 
-    public TalkingJudge(KeyPresser presser, int gracePeriod) throws AWTException {
+    public TalkingJudge(KeyPresser presser, int gracePeriod) {
         this.gracePeriod = gracePeriod;
         this.presser = presser;