Changeset 1561 for trunk/src/org/apollo/gui/PlaybackControlPopup.java

Timestamp:

05/19/21 09:01:33 (3 years ago)

Author:

davidb

Message:

A set of changes that spans three things: beat detection, time stretching; and a debug class motivated by the need to look at a canvas redraw issue most notable when a waveform widget is playing

File:

• trunk/src/org/apollo/gui/PlaybackControlPopup.java (modified) (5 diffs)

trunk/src/org/apollo/gui/PlaybackControlPopup.java

@@ -39 +39 @@
         public JToggleButton muteButton;
         public JToggleButton soloButton;
+        public JToggleButton beatDetectButton;
         public JButton miscButton;
         public JSlider volumeSlider;
@@ -100 +101 @@
                 });
                 
+                beatDetectButton = new JToggleButton();
+                SwingMiscManager.setJButtonIcon(beatDetectButton,IconRepository.getIcon("beatDetect.png"));
+                SwingMiscManager.setJButtonSelectedIcon(beatDetectButton,IconRepository.getIcon("beatDetect-no-sticks.png"));
+                beatDetectButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
+                beatDetectButton.setToolTipText("Toggle beat detection in track");
+
+                beatDetectButton.addChangeListener(new ChangeListener() {
+                        public void stateChanged(ChangeEvent e) {
+                                if (!PlaybackControlPopup.this.isUpdatingGUI) {
+                                        beatDetectChanged();
+                                }
+                        }
+                });
+
                 miscButton = new JButton();
                 miscButton.addActionListener(this);
@@ -155 +170 @@
                 c.gridy = 0;
                 c.fill = GridBagConstraints.BOTH;
+                panel.add(beatDetectButton, c);
+                
+                c = new GridBagConstraints();
+                c.gridx = 6;
+                c.gridy = 0;
+                c.fill = GridBagConstraints.BOTH;
                 c.insets = new Insets(0,VOLUME_SPACING,0,VOLUME_SPACING);
                 panel.add(volumeSlider, c);
                 
                 c = new GridBagConstraints();
-                c.gridx = 7;
+                c.gridx = 8;
                 c.gridy = 0;
                 c.fill = GridBagConstraints.BOTH;
@@ -211 +232 @@
 //              this.setSize(BUTTON_SIZE * 4, BUTTON_SIZE * 2);
                 
-                panel.setSize(BUTTON_SIZE * 8, BUTTON_SIZE);
+                panel.setSize(BUTTON_SIZE * 9, BUTTON_SIZE);
                 
                 panel.doLayout();
@@ -270 +291 @@
         protected abstract void soloChanged();
         
+        protected abstract void beatDetectChanged();
+
         
         /**