Changeset 332 for trunk/src_apollo/org/apollo/widgets

Timestamp:

09/25/08 18:02:39 (16 years ago)

Author:

bjn8

Message:

metronome improvements

Location:

trunk/src_apollo/org/apollo/widgets

Files:

• MetronomePlayer.java (modified) (8 diffs)
• SampleRecorder.java (modified) (1 diff)

trunk/src_apollo/org/apollo/widgets/MetronomePlayer.java

@@ -5 +5 @@
 import java.awt.event.ActionListener;
 
-import javax.sound.midi.InvalidMidiDataException;
 import javax.sound.midi.MidiUnavailableException;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
@@ -39 +39 @@
         private JButton startStopButton;
         private JComboBox beatsPerMeasureCombo;
+        private JCheckBox enabledCheckbox;
         private boolean interfaceIsUpdating = false;
         
-        private static final int MAX_BPM = 200;
+        private static final int MAX_BPM = 300;
 
         public MetronomePlayer(Text source, String[] args) {
-                super(source, new JPanel(), 130, 130, 155, 155);
+                super(source, new JPanel(), 130, 130, 175, 175);
                 
                 tempoLabel = new JLabel();
@@ -61 +62 @@
                                         } catch (MidiUnavailableException e1) {
                                                 e1.printStackTrace();
-                                        } catch (InvalidMidiDataException e1) {
-                                                e1.printStackTrace();
-                                        }
+                                        } 
                                 }
                                 
@@ -80 +79 @@
                                         } catch (MidiUnavailableException e1) {
                                                 e1.printStackTrace();
-                                        } catch (InvalidMidiDataException e1) {
-                                                e1.printStackTrace();
-                                        }
+                                        } 
                                 }
                         }
@@ -98 +95 @@
                                 }
                                 
+                        }
+                        
+                });
+                
+                enabledCheckbox = new JCheckBox("Auto-start");
+                enabledCheckbox.addActionListener(new ActionListener() {
+
+                        public void actionPerformed(ActionEvent e) {
+                                if (!interfaceIsUpdating) {
+                                        Metronome.getInstance().setEnabled(enabledCheckbox.isSelected());
+                                }
                         }
                         
@@ -109 +117 @@
                 _swingComponent.add(new JLabel("Beats per measure:"));
                 _swingComponent.add(beatsPerMeasureCombo);
+                _swingComponent.add(enabledCheckbox);
                 
         }
@@ -122 +131 @@
                         
                         if (Metronome.getInstance().isPlaying()) {
-                                startStopButton.setIcon(IconRepository.getIcon("stop.png"));
+                                startStopButton.setIcon(IconRepository.getIcon("metrostop.png"));
+                                setWidgetEdgeThickness(TrackWidgetCommons.PLAYING_TRACK_EDGE_THICKNESS);
+        
                         } else {
-                                startStopButton.setIcon(IconRepository.getIcon("play.png"));
+                                startStopButton.setIcon(IconRepository.getIcon("metroplay.png"));
+                                setWidgetEdgeThickness(TrackWidgetCommons.STOPPED_TRACK_EDGE_THICKNESS);
                         }
                         
                         int index = Math.min(beatsPerMeasureCombo.getItemCount(), Metronome.getInstance().getBeatsPerMeasure()) - 1;
                         beatsPerMeasureCombo.setSelectedIndex(index);
+                        
+                        enabledCheckbox.setSelected(Metronome.getInstance().isEnabled());
+                        if (Metronome.getInstance().isEnabled()) {
+                                enabledCheckbox.setText("Auto-start on");
+                        } else {
+                                enabledCheckbox.setText("Auto-start off");
+                        }
                         
                 } finally {
@@ -158 +177 @@
                 case ApolloSubjectChangedEvent.METRONOME_STOPPED:
                 case ApolloSubjectChangedEvent.METRONOME_TEMPO_CHANGED:
+                case ApolloSubjectChangedEvent.METRONOME_ENABLED_CHANGED:
                         updateInterface();
                         break;

trunk/src_apollo/org/apollo/widgets/SampleRecorder.java

@@ -133 +133 @@
                 
                 recordSynchedButton = new JButton();
-                recordSynchedButton.setIcon(IconRepository.getIcon("recordtime.png"));
+                recordSynchedButton.setIcon(IconRepository.getIcon("recordplay.png"));
                 recordSynchedButton.addActionListener(this);
                 recordSynchedButton.setPreferredSize(new Dimension(AnimatedSampleGraph.GRAPH_WIDTH / 2, BUTTON_HEIGHT));