Changeset 1561 for trunk/src/org/apollo/gui/SampledTrackGraphView.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/SampledTrackGraphView.java (modified) (5 diffs)

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

@@ -70 +70 @@
         private int timescaleFrameLength = 0; // in frames
         
+        private double timeStretchFactor = 1.0;
+        
         private final Font RENDER_MESSAGE_FONT = new Font("Arial", Font.BOLD | Font.ITALIC, 14);
         
@@ -80 +82 @@
         private Color backColorHighlights = DEFAULT_BACKGROUND_HIGHTLIGHTS_COLOR;
         
-        public static final Color PLAYBACK_BAR_COLOR = new Color(225, 187, 15);
+        public static final Color PLAYBACK_BAR_COLOR = new Color(225, 187, 15); // ******
         
         /** The stroke used for drawing graph bars. E.G: The selection Start bar. */
@@ -546 +548 @@
         }
         
+        
+        public void setTimeStretchFactor(double time_stretch_factor) {
+                timeStretchFactor = time_stretch_factor;
+        }
+        
+        public double getTimeStretchFactor()
+        {
+                return timeStretchFactor;
+        }
+
         /**
          * Re-renders the waveform buffers to match the graph size if it needs to.
@@ -623 +635 @@
                                 trackModel.getAllAudioBytes(),
                                 trackModel.getFormat(),
+                                trackModel.getBeats(),
                                 timescaleFrameStart,
                                 timescaleFrameLength,
@@ -743 +756 @@
                         
                         int x = getPlaybackXPos(currentPlaybackFramePosition);
+                        //System.out.println("*** playback x = " + x);
+                        
+                        x = (int)Math.rint(((double)x) * getTimeStretchFactor()); // ******
                         
                         if (x >= 0 && x <= getWidth()) {
-                                
+                                        
                                 ((Graphics2D)g).setStroke(GRAPH_BAR_STROKE);
                                 g.setColor(PLAYBACK_BAR_COLOR);