Changeset 340

Timestamp:

10/04/08 14:26:47 (16 years ago)

Author:

bjn8

Message:

Fixed timeline-infer algorithm

Location:

trunk/src_apollo/org/apollo

Files:

• audio/util/FrameLayoutDaemon.java (modified) (5 diffs)
• audio/util/SoundDesk.java (modified) (1 diff)
• widgets/SampledTrack.java (modified) (1 diff)

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

@@ -665 +665 @@
                 Integer unavilableLongestEndTimeRightPixel = null;
 
-                long firstInitiationTime = 0;
+                NullableLong firstInitiationTime = null;
                 int initiationXPixel = 0;
 
                 long longestEndTime = -1; 
                 int longestEndTimeRightPixel = 0;
+                
                 
                 // Look for all track widgets
@@ -682 +683 @@
                                                 frame.getName());
                 
+                                // Is the initiation time available?
                                 NullableLong it = (tgi != null) ? 
                                         new NullableLong(tgi.getInitiationTime()) :
                                                 NullableLong.fromLong(sampledTrackWidget.getInitiationTimeFromMeta());
                                 
+                                // If not - keep record left-most unavilable x pixel
                                 if (it == null && 
                                                 (unavilableInitiationXPixel == null || iw.getX() < unavilableInitiationXPixel)) {
                                         unavilableInitiationXPixel = iw.getX();
-                                } else if(it != null && it.getLongValue() < firstInitiationTime) {
-                                        firstInitiationTime = it.getLongValue();
+                                
+                                // If so - check to see if it is the first initiation time on the frame
+                                } else if(it != null && (firstInitiationTime == null ||
+                                                it.getLongValue() < firstInitiationTime.getLongValue())) {
+                                        firstInitiationTime = it;
                                         initiationXPixel = iw.getX();
                                 }
@@ -753 +759 @@
                                                 (unavilableInitiationXPixel == null || iw.getX() < unavilableInitiationXPixel)) {
                                         unavilableInitiationXPixel = iw.getX();
-                                } else if(it != null && it.getLongValue() < firstInitiationTime) {
-                                        firstInitiationTime = it.getLongValue();
+                                } else if(it != null && (firstInitiationTime == null ||
+                                                it.getLongValue() < firstInitiationTime.getLongValue())) {
+                                        firstInitiationTime = it;
                                         initiationXPixel = iw.getX();
                                 }
@@ -791 +798 @@
                 }
                 
+                if (firstInitiationTime == null) firstInitiationTime = new NullableLong(0L);
+                
                 if (longestEndTime > 0) {
                         
-                        assert(longestEndTime > firstInitiationTime);
+                        assert(longestEndTime > firstInitiationTime.getLongValue());
                         assert(longestEndTimeRightPixel > initiationXPixel);
                         
-                        long rttime = longestEndTime - firstInitiationTime;
+                        long rttime = longestEndTime - firstInitiationTime.getLongValue();
                         int pxWidth = longestEndTimeRightPixel - initiationXPixel;
                         if (unavilableLongestEndTime != null &&
@@ -806 +815 @@
 
                         return new Timeline(
-                                        firstInitiationTime, 
+                                        firstInitiationTime.getLongValue(), 
                                         rttime, 
                                         initiationXPixel,

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

@@ -44 +44 @@
  * 
  * By Apollo API I mean the {@link org.apollo.audio} package.
+ * 
+ * TODO: This is a mess and needs to be rethought - possibly completely removed. Originally
+ * designed for allowing for many mix options but this is probably to confusing for the user.
  * 
  * @author Brook Novak

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

@@ -1373 +1373 @@
                                                         FrameLayoutDaemon.getInstance().getMSAtX(getX(), parent)
                                                         : 0;
-
+                                        
                                         // Keep TrackGraphModel consistant
                                         AudioStructureModel.getInstance().onTrackWidgetAnchored(