Changeset 367

Timestamp:

10/11/08 15:48:21 (16 years ago)

Author:

bjn8

Message:

Small fixes

Location:

trunk/src_apollo/org/apollo/audio

Files:

• ApolloSubjectChangedEvent.java (modified) (1 diff)
• structure/AudioStructureModel.java (modified) (7 diffs)
• util/MultiTrackPlaybackController.java (modified) (3 diffs)
• util/SoundDesk.java (modified) (2 diffs)

trunk/src_apollo/org/apollo/audio/ApolloSubjectChangedEvent.java

@@ -62 +62 @@
         
         /** In terms of Y-Pixel OR Initiation time (implicit X pixel)*/
-        public static final int GRAPH_POSITION_CHANGED = 127;
+        public static final int GRAPH_TRACK_POSITION_CHANGED = 127;
+        
+        /** In terms of Y-Pixel OR Initiation time (implicit X pixel)*/
+        public static final int GRAPH_LINKED_TRACK_POSITION_CHANGED = 128;
         
         /** The channel ID of the track sequence is passed as state info. */

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

@@ -1187 +1187 @@
 
                 boolean doNotify = false;
+                AbstractTrackGraphNode tinf = null;
                 
                 synchronized(sharedResourceLocker) { // IMPORTANT: Must wait for new graphs to be added to the shared resources
@@ -1194 +1195 @@
                         // Locate parent frame
                         OverdubbedFrame odframe = null;
-                        
+
                         if (parentFrameName != null) odframe = allOverdubbedFrames.get(parentFrameName.toLowerCase());
                         else odframe = getParentOverdubbedFrame(localFilename);
@@ -1200 +1201 @@
                         // adjust name in model
                         if (odframe != null) { // is loaded?
-                                AbstractTrackGraphNode tinf = odframe.getTrack(localFilename);
+                                tinf = odframe.getTrack(localFilename);
                                 if (tinf != null && 
                                                 (tinf.getInitiationTime() != initTime || tinf.getYPixelPosition() != yPos)) {
@@ -1216 +1217 @@
                 // Notify observers.
                 if (doNotify)
-                        fireSubjectChanged(new SubjectChangedEvent(ApolloSubjectChangedEvent.GRAPH_POSITION_CHANGED, null));
+                        fireSubjectChanged(new SubjectChangedEvent(ApolloSubjectChangedEvent.GRAPH_TRACK_POSITION_CHANGED, tinf));
         }
 
@@ -1240 +1241 @@
 
                 boolean doNotify = false;
+                AbstractTrackGraphNode tinf = null;
                 
                 synchronized(sharedResourceLocker) { // IMPORTANT: Must wait for new graphs to be added to the shared resources
@@ -1253 +1255 @@
                         // adjust name in model
                         if (odframe != null) { // is loaded?
-                                AbstractTrackGraphNode tinf = odframe.getLinkedTrack(virtualFilename);
+                                tinf = odframe.getLinkedTrack(virtualFilename);
                                 if (tinf != null && 
                                                 (tinf.getInitiationTime() != initTime || tinf.getYPixelPosition() != yPos)) {
@@ -1270 +1272 @@
                 // Notify observers.
                 if (doNotify)
-                        fireSubjectChanged(new SubjectChangedEvent(ApolloSubjectChangedEvent.GRAPH_POSITION_CHANGED, null));
+                        fireSubjectChanged(new SubjectChangedEvent(ApolloSubjectChangedEvent.GRAPH_LINKED_TRACK_POSITION_CHANGED, tinf));
         }
         

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

@@ -114 +114 @@
                 switch (event.getID()) {
                 case ApolloSubjectChangedEvent.GRAPH_TRACK_REMOVED: // TODO: Remove while loading!
-                        
+                case ApolloSubjectChangedEvent.GRAPH_TRACK_POSITION_CHANGED:
                         
                         if (isPlaying()) {
@@ -140 +140 @@
                                 
                         }
-                        
-//                       Fall through
+                        canInstantlyResume = false;
+                        break;
+
+                case ApolloSubjectChangedEvent.GRAPH_LINKED_TRACK_POSITION_CHANGED:
                 case ApolloSubjectChangedEvent.GRAPH_LINKED_TRACK_REMOVED: // TODO: Remove while loading!
                         
@@ -171 +173 @@
                                 }
                         }
-                                
-                        // Fall through
+                        
+                        canInstantlyResume = false;
+                        break;
+                                
                 case ApolloSubjectChangedEvent.GRAPH_LINKED_TRACK_ADDED:
                 case ApolloSubjectChangedEvent.GRAPH_TRACK_ADDED:
                 case ApolloSubjectChangedEvent.GRAPH_TRACK_EDITED: 
-                        
-                        // TODO: FINER CONTROL: If change is event related to the current group 
-                        // of overdubs and if it can be managed.
                         this.canInstantlyResume = false;
-                        
                         break;
                         

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

@@ -1305 +1305 @@
                  * as the TrackMixSubject channel ID.
                  **/
-                String masterMixID; // never null, itself can be amastermix
+                String masterMixID; // never null, itself can be a mastermix
                 
                 TrackSequence tseq; // resets to null to avoid holding expensive state ref (track model)
@@ -1322 +1322 @@
                  * 
                  * @throws IllegalArgumentException
-                 *              If mixSub's channel ID is invlaid.
+                 *              If mixSub's channel ID is invalid.
                  */
                 Channel(TrackMixSubject mixSub) {