Changeset 367 for trunk/src_apollo/org/apollo/audio/structure/AudioStructureModel.java

Timestamp:

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

Author:

bjn8

Message:

Small fixes

File:

• trunk/src_apollo/org/apollo/audio/structure/AudioStructureModel.java (modified) (7 diffs)

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));
         }