Changeset 342

Timestamp:

10/04/08 16:20:57 (16 years ago)

Author:

bjn8

Message:

Fixed timing accuracy-issues with overdubbing

Location:

trunk/src_apollo/org/apollo

Files:

• audio/structure/AudioStructureModel.java (modified) (1 diff)
• audio/util/FrameLayoutDaemon.java (modified) (1 diff)
• gui/EditableSampledTrackGraphView.java (modified) (1 diff)
• util/AudioMath.java (modified) (1 diff)
• widgets/SampleRecorder.java (modified) (2 diffs)
• widgets/SampledTrack.java (modified) (12 diffs)

trunk/src_apollo/org/apollo/audio/structure/AudioStructureModel.java

@@ -1093 +1093 @@
                                 if (odframe != null) {
                                         tinf = odframe.removeTrack(localFilename);
-                                        assert(tinf != null);
+                                        //assert(tinf != null);
                                         cancelFetch = doNotify = true;
                                 }

trunk/src_apollo/org/apollo/audio/util/FrameLayoutDaemon.java

@@ -553 +553 @@
          * 
          * @return
+         *              The best timeline for the given frame - null if could not infer (if had to).
          */
         public Timeline getTimeline(Frame targetFrame) {

trunk/src_apollo/org/apollo/gui/EditableSampledTrackGraphView.java

@@ -279 +279 @@
                                                 0, 
                                                 0,
-                                                -1,
                                                 TrackNameCreator.getDefaultName(),
                                                 getMix());

trunk/src_apollo/org/apollo/util/AudioMath.java

@@ -27 +27 @@
          */
         public static int millisecondsToFrames(long ms, AudioFormat format) {
-                double portion = ms;
-                portion /= 1000.0;
-                return (int)(format.getFrameRate() * portion);
+                double tmp = ms * format.getFrameRate();
+                tmp /= 1000.0;
+                return (int)tmp;
         }
         
         public static long framesToMilliseconds(long frames, AudioFormat format) {
-                double portion = frames;
-                portion /= (double)format.getFrameRate();
-                return (long)(portion * 1000.0);
+                double tmp = frames * 1000.0;
+                tmp /= (double)format.getFrameRate();
+                return (long)tmp;
         }
         

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

@@ -386 +386 @@
                                                          getX(), 
                                                          getY(),
-                                                         initiationTime, 
                                                          TrackNameCreator.getNameCopy(targetFrame.getTitle() + "_"),
                                                          null);
@@ -393 +392 @@
                                                  
                                                  targetFrame.addAllItems(trackWidget.getItems());
-                
+                                                 
+                                                 // Must be exact
+                                                 trackWidget.setInitiationTime(initiationTime);
+
                                          } else {
                                                  

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

@@ -405 +405 @@
                                 }
                                 
-                                // Toggle indexing
+                                // Toggle pitch-track indexing
                                 if (e.isControlDown() && e.getKeyCode() == KeyEvent.VK_I) {
                                         setShouldOmitIndexAudio(!shouldOmitIndexAudio());
@@ -453 +453 @@
                                                         initTime += AudioMath.framesToMilliseconds(rightSideStartFrame, trackModel.getFormat());
                                                         
+                                                        System.out.println("initTime = " + getInitiationTimeFromMeta() + " + " + AudioMath.framesToMilliseconds(rightSideStartFrame, trackModel.getFormat()) 
+                                                                        + " = " + initTime);
+                                                        
                                                         SampledTrack rightSideTrack = SampledTrack.createFromMemory(
                                                                         rightsideAudio, 
@@ -459 +462 @@
                                                                         0, // X Coord overridden
                                                                         getY(), 
-                                                                        initTime, 
                                                                         getName() + " part", 
                                                                         trackMix);
@@ -465 +467 @@
                                                         // Anchor it
                                                         target.addAllItems(rightSideTrack.getItems());
+                                                        
+                                                        // Adjust initiation time to be exact
+                                                        rightSideTrack.setInitiationTime(initTime);
+                                                        
+                                                        // TODO: FrameLayoutDaemon.getInstance().resumeLayout(this); ?
                                                 }
                                                 
@@ -511 +518 @@
         /**
          * Creates a {@link SampledTrack} instantly from audio bytes in memory and adds it to a given frame.
+         * 
          * @param audioBytes
          *                      The audio samples.
@@ -523 +531 @@
          * 
          * @param y
-         * 
-         * @param specificInitTime
-         *              Negative to determine init time from x position. Positive to override
-         *              and determine x position from given init time
          * 
          * @param name
@@ -543 +547 @@
                         Frame targetFrame,
                         int x, int y,
-                        long specificInitTime,
                         String name,
                         TrackMixSubject mixTemplate) {
@@ -554 +557 @@
                 source.setParent(targetFrame);
                 
-                
-                
+
                 long runningtime = AudioMath.framesToMilliseconds(
                                 audioBytes.length / format.getFrameSize(), format);
-                
                 
                 Timeline tl = FrameLayoutDaemon.getInstance().getTimeline(targetFrame);
@@ -570 +571 @@
                 if (width > 0 && width < FrameLayoutDaemon.MIN_TRACK_WIDGET_WIDTH) width = FrameLayoutDaemon.MIN_TRACK_WIDGET_WIDTH;
 
-                if (specificInitTime < 0) {
-                        
-                        if (tl == null) specificInitTime = 0;
-                        else specificInitTime = tl.getMSTimeAtX(x);
-                        
-                } else if (tl != null) { // if defined a specific ms time and a timeline is avialable
-                        
-                        x = tl.getXAtMSTime(specificInitTime);
-                } 
-                
+                long initTime = (tl == null) ? 0 : tl.getMSTimeAtX(x);
+
                 source.setPosition(x, y);
                         
@@ -585 +578 @@
                 LinkedList<String> data = new LinkedList<String>();
 
-                data.add(TrackWidgetCommons.META_INITIATIONTIME_TAG + specificInitTime);
+                data.add(TrackWidgetCommons.META_INITIATIONTIME_TAG + initTime);
                 data.add(TrackWidgetCommons.META_LAST_WIDTH_TAG + width); // although layout manager will handle, just to quick set
                 if (name != null) data.add(TrackWidgetCommons.META_NAME_TAG + name);
@@ -703 +696 @@
                                         getX(), 
                                         getY(),
-                                        -1,
                                         TrackNameCreator.getNameCopy(trackModel.getName()),
                                         trackMix);
@@ -1571 +1563 @@
         public Long getInitiationTimeFromMeta() {
                 return getStrippedDataLong(TrackWidgetCommons.META_INITIATIONTIME_TAG, null);
+        }
+        
+        /**
+         * Adjusts the initiation time for this track - to the exact millisecond.
+         * 
+         * The x-position is updated (which will be eventually done with possibly better
+         * accuracy if the layout daemon is on)
+         * 
+         * @param specificInitTime
+         *              The new initiation time for this track in milliseconds
+         */
+        public void setInitiationTime(long specificInitTime) {
+                
+                Frame parent = getParentFrame();
+                
+                // Update x position if it can
+                if (parent != null) {
+                        Timeline tl = FrameLayoutDaemon.getInstance().getTimeline(parent);
+                        if (tl != null) {
+                                this.setPosition(tl.getXAtMSTime(specificInitTime), getY());
+                        }
+                }
+                
+                updateData(TrackWidgetCommons.META_INITIATIONTIME_TAG, TrackWidgetCommons.META_INITIATIONTIME_TAG + specificInitTime);
+                
+                // If this track is in the audio model ...
+                if (AudioStructureModel.getInstance().getTrackGraphInfo(localFileName, (parent != null) ? parent.getName() : null) != null)  {
+                        
+                        // Add and remove it
+                        AudioStructureModel.getInstance().onTrackWidgetRemoved(
+                                        localFileName, (parent != null) ? parent.getName() : null);
+                        
+                        AudioStructureModel.getInstance().onTrackWidgetAnchored(
+                                        localFileName, (parent != null) ? parent.getName() : null, 
+                                                        specificInitTime, getRunningMSTimeFromRawAudio(), getName());
+                }
         }