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

Timestamp:

10/05/08 14:30:01 (16 years ago)

Author:

bjn8

Message:

Improve mouse interactions a little with accurate audio placement

Location:

trunk/src_apollo/org/apollo/widgets

Files:

• LinkedTrack.java (modified) (3 diffs)
• SampledTrack.java (modified) (3 diffs)

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

@@ -31 +31 @@
 
 import org.apollo.ApolloSystem;
+import org.apollo.AudioFrameMouseActions;
 import org.apollo.audio.ApolloSubjectChangedEvent;
 import org.apollo.audio.SampledAudioManager;
@@ -57 +58 @@
 import org.apollo.util.AudioMath;
 import org.apollo.util.AudioSystemLog;
+import org.apollo.util.NullableLong;
 import org.apollo.util.ODFrameHeirarchyFetcher;
 import org.apollo.util.PopupReaper;
@@ -645 +647 @@
                         String link = getAbsoluteLink();
 
-                        // Determine new initation time according to anchored position
-                        long initTime = (parent != null) ? 
-                                                FrameLayoutDaemon.getInstance().getMSAtX(getX(), parent)
-                                                : 0;
+
+                        // Determine new initation time according to anchored position...
+                        long initTime = getInitiationTimeFromMeta();
+                        
+                        // If the user is restricting-y-axis movement then they might be moving 
+                        // this tracks Y-position only for layout reasons as opposed to repositioning
+                        // where in the audio timeline the track should be. This must be accurate and
+                        // avoid loosing the exact initiation time due to pixel-resolutoin issues
+                        if (parent != null) {
+                                
+                                boolean inferInitTime = true;
+                                
+                                if (AudioFrameMouseActions.isYAxisRestictionOn()) {
+                                        Long ms = getInitiationTimeFromMeta();
+                                        if (ms != null) {
+                                                NullableLong timex = FrameLayoutDaemon.getInstance().getXAtMS(
+                                                                ms, 
+                                                                parent);
+                                                if (timex != null && timex.getLongValue() == getX()) {
+                                                        initTime = ms;
+                                                        inferInitTime = false;
+                                                }
+                                        }
+                                }
+
+                                if (inferInitTime) 
+                                        initTime = FrameLayoutDaemon.getInstance().getMSAtX(getX(), parent);
+                        }
 
                         if (link != null) {

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

@@ -28 +28 @@
 import javax.swing.SwingUtilities;
 
+import org.apollo.AudioFrameMouseActions;
 import org.apollo.audio.ApolloPlaybackMixer;
 import org.apollo.audio.ApolloSubjectChangedEvent;
@@ -53 +54 @@
 import org.apollo.mvc.SubjectChangedEvent;
 import org.apollo.util.AudioMath;
+import org.apollo.util.NullableLong;
 import org.apollo.util.PopupReaper;
 import org.apollo.util.TrackModelHandler;
@@ -1361 +1363 @@
                                         parent = getParentFrame();
 
-                                        // Determine new initation time according to anchored position
-                                        long initTime = (parent != null) ? 
-                                                        FrameLayoutDaemon.getInstance().getMSAtX(getX(), parent)
-                                                        : 0;
-                                        
+                                        // Determine new initation time according to anchored position...
+                                        long initTime = getInitiationTimeFromMeta();
+                                        
+                                        // If the user is restricting-y-axis movement then they might be moving 
+                                        // this tracks Y-position only for layout reasons as opposed to repositioning
+                                        // where in the audio timeline the track should be. This must be accurate and
+                                        // avoid loosing the exact initiation time due to pixel-resolutoin issues
+                                        if (parent != null) {
+                                                
+                                                boolean inferInitTime = true;
+                                                
+                                                if (AudioFrameMouseActions.isYAxisRestictionOn()) {
+                                                        Long ms = getInitiationTimeFromMeta();
+                                                        if (ms != null) {
+                                                                NullableLong timex = FrameLayoutDaemon.getInstance().getXAtMS(
+                                                                                ms, 
+                                                                                parent);
+                                                                if (timex != null && timex.getLongValue() == getX()) {
+                                                                        initTime = ms;
+                                                                        inferInitTime = false;
+                                                                }
+                                                        }
+                                                }
+
+                                                if (inferInitTime) 
+                                                        initTime = FrameLayoutDaemon.getInstance().getMSAtX(getX(), parent);
+                                        }
+
                                         // Keep TrackGraphModel consistant
                                         AudioStructureModel.getInstance().onTrackWidgetAnchored(