Changeset 345

Timestamp:

10/05/08 20:13:15 (16 years ago)

Author:

bjn8

Message:

Now allows for finer positioning of audio tracks via keyboard.

Location:

trunk

Files:

• src/org/expeditee/gui/Browser.java (modified) (1 diff)
• src/org/expeditee/gui/FrameKeyboardActions.java (modified) (1 diff)
• src_apollo/org/apollo/ApolloSystem.java (modified) (2 diffs)
• src_apollo/org/apollo/AudioFrameKeyboardActions.java (modified) (5 diffs)
• src_apollo/org/apollo/widgets/LinkedTrack.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/Browser.java

@@ -239 +239 @@
                                 MessageBay.warningMessage(message);
 
-                        FrameKeyboardActions keyboardListner = new FrameKeyboardActions();
-                        this.getContentPane().addKeyListener(keyboardListner);
-                        this.addKeyListener(keyboardListner);
+                        this.getContentPane().addKeyListener(FrameKeyboardActions.getInstance());
+                        this.addKeyListener(FrameKeyboardActions.getInstance());
                         
                         _mouseEventRouter.addExpediteeMouseListener(FrameMouseActions.getInstance());

trunk/src/org/expeditee/gui/FrameKeyboardActions.java

@@ -38 +38 @@
 
 public class FrameKeyboardActions implements KeyListener {
+        
+        private static FrameKeyboardActions _instance = new FrameKeyboardActions();
+        private FrameKeyboardActions() {        
+        }
+        
+        public static FrameKeyboardActions getInstance() {
+                return _instance;
+        }
+        
 
         private static Text _toRemove = null;

trunk/src_apollo/org/apollo/ApolloSystem.java

@@ -27 +27 @@
 import org.expeditee.actions.Actions;
 import org.expeditee.gui.Browser;
+import org.expeditee.gui.FrameKeyboardActions;
 import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.importer.FrameDNDTransferHandler;
@@ -108 +109 @@
                                 });
                                 
+                                Browser._theBrowser.getContentPane().removeKeyListener(FrameKeyboardActions.getInstance());
+                                Browser._theBrowser.removeKeyListener(FrameKeyboardActions.getInstance());
+                                
                                 Browser._theBrowser.getContentPane().addKeyListener(new AudioFrameKeyboardActions());
-
+                                Browser._theBrowser.addKeyListener(new AudioFrameKeyboardActions());
+                                
                                 // Filter out some special mouse move cases
                                 Browser._theBrowser.getMouseEventRouter().removeExpediteeMouseMotionListener(

trunk/src_apollo/org/apollo/AudioFrameKeyboardActions.java

@@ -4 +4 @@
 import java.awt.event.KeyListener;
 
+import org.apollo.widgets.LinkedTrack;
+import org.apollo.widgets.SampledTrack;
 import org.expeditee.gui.FrameGraphics;
+import org.expeditee.gui.FrameKeyboardActions;
+import org.expeditee.gui.FrameMouseActions;
+import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.WidgetCorner;
+import org.expeditee.items.widgets.WidgetEdge;
 
 /**
@@ -16 +23 @@
         static boolean isControlDown = false;
         static boolean isShiftDown = false;
+        
+        private static final long TRACK_WIDGET_TIMELINE_ADJUSTMENT = 50; // In audio-frames
 
         public void keyPressed(KeyEvent e) {
@@ -22 +31 @@
                 isShiftDown = e.isShiftDown();
                 
-                if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
-                        FrameGraphics.refresh(false); // For special post effects
+                boolean forwardToExpeditee = true;
+                
+                switch(e.getKeyCode()) { 
+                
+                        case KeyEvent.VK_CONTROL:
+                                FrameGraphics.refresh(false); // For special post effects
+                                break;
+                                
+                        // Ultra-fine timeline placement of audio tracks
+                        case KeyEvent.VK_RIGHT:
+                        case KeyEvent.VK_LEFT:
+                                
+                                if (isControlDown) {
+                                        InteractiveWidget selectedIW = null;
+                                        
+                                        if (FrameMouseActions.getlastHighlightedItem() != null &&
+                                                        FrameMouseActions.getlastHighlightedItem() instanceof WidgetEdge) {
+                                                selectedIW = ((WidgetEdge)FrameMouseActions.getlastHighlightedItem()).getWidgetSource();
+                                        } else if (FrameMouseActions.getlastHighlightedItem() != null &&
+                                                        FrameMouseActions.getlastHighlightedItem() instanceof WidgetCorner) {
+                                                selectedIW = ((WidgetCorner)FrameMouseActions.getlastHighlightedItem()).getWidgetSource();
+                                        }
+                                        
+                                        long frameAjdustment = TRACK_WIDGET_TIMELINE_ADJUSTMENT;
+                                        if (e.getKeyCode() ==  KeyEvent.VK_LEFT) frameAjdustment *= -1;
+                                        
+                                        if (selectedIW != null && selectedIW instanceof SampledTrack) {
+                                                SampledTrack stwidget = (SampledTrack)selectedIW;
+                                                stwidget.setInitiationTime(stwidget.getInitiationTimeFromMeta() + frameAjdustment);
+                                                forwardToExpeditee = false;
+                                        } else if (selectedIW != null && selectedIW instanceof LinkedTrack) {
+                                                LinkedTrack ltwidget = (LinkedTrack)selectedIW;
+                                                ltwidget.setInitiationTime(ltwidget.getInitiationTimeFromMeta() + frameAjdustment);
+                                                forwardToExpeditee = false;
+                                        }
+                                                        
+                                }
+
+                                break;
                 }
                 
+                if (forwardToExpeditee) {
+                        FrameKeyboardActions.getInstance().keyPressed(e);
+                }
+        
         }
 
@@ -32 +82 @@
                 isControlDown = e.isControlDown();
                 isShiftDown = e.isShiftDown();
-                
+
                 switch(e.getKeyCode()) {
                         case  KeyEvent.VK_CONTROL:
@@ -42 +92 @@
                                 }
                                 break;
+                                
                 }
+                
+                FrameKeyboardActions.getInstance().keyReleased(e);
         }
 
         public void keyTyped(KeyEvent e) {
+                FrameKeyboardActions.getInstance().keyTyped(e);
         }
         

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

@@ -43 +43 @@
 import org.apollo.audio.util.PlaybackClock;
 import org.apollo.audio.util.SoundDesk;
+import org.apollo.audio.util.Timeline;
 import org.apollo.audio.util.TrackMixSubject;
 import org.apollo.audio.util.MultiTrackPlaybackController.MultitrackLoadListener;
@@ -853 +854 @@
         }
         
+
+        /**
+         * 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);
+                
+                String absLink = getAbsoluteLink();
+                
+                // If this track is in the audio model ...
+                if (AudioStructureModel.getInstance().getLinkedTrackGraphInfo(virtualFilename, (parent != null) ? parent.getName() : null) != null &&
+                                absLink != null)  {
+                        
+                        FrameLayoutDaemon.getInstance().suspendLayout(DisplayIO.getCurrentFrame(), null);
+                        
+                        try {
+                        
+                                // Add and remove it
+                                AudioStructureModel.getInstance().onLinkedTrackWidgetRemoved(virtualFilename, (parent != null) ? parent.getName() : null);
+        
+                                AudioStructureModel.getInstance().onLinkedTrackWidgetAnchored(
+                                                virtualFilename, 
+                                                (parent != null) ? parent.getName() : null,
+                                                                specificInitTime, 
+                                                                absLink, 
+                                                getName());
+                                
+                        } finally {
+                                FrameLayoutDaemon.getInstance().resumeLayout(null);
+                        }
+
+                }
+        }
+        
         /**
          * @return