Changeset 363 for trunk/src_apollo/org/apollo/audio/util/MultiTrackPlaybackController.java

Timestamp:

10/10/08 21:31:39 (16 years ago)

Author:

bjn8

Message:

Lots of flaws in threading fixed. Several bad states gone - playback more interactive now

File:

• trunk/src_apollo/org/apollo/audio/util/MultiTrackPlaybackController.java (modified) (5 diffs)

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

@@ -223 +223 @@
                         // Can get many of these over time in one playback call... so make sure that a event is raised
                         // on the first event received...
+                        System.out.println("MULTI ApolloSubjectChangedEvent.PLAYBACK_STARTED");
                         if (isPlaybackPending) {
                                 isPlaybackPending = false;
@@ -232 +233 @@
                         
                         // Keep track of what is/isn't playing. Note that currentTrackSequences is cleared explicity
-                        // event before stop events occur when playback is commences while already playing back
+                        // before stop events occur when playback is commences while already playing back
                 case ApolloSubjectChangedEvent.PLAYBACK_STOPPED:
-                        
+
+                        System.out.println("MULTI ApolloSubjectChangedEvent.PLAYBACK_STOPPED");
                         if (currentTrackSequences != null && !currentTrackSequences.isEmpty()) {
                                 
                                 currentTrackSequences.remove(source);
+                                //if (currentTrackSequences.remove(source)) isPlaybackPending = false;
                                 
                                 ts = (TrackSequence)source;
@@ -596 +599 @@
                                 && isCurrentPlaybackSubject(rootFrameName, masterMixID)) {
 
-                        // Notify listener that load phase has instnatly completed
+                        // Notify listener that load phase has instantly completed
                         notifyListeners(loadListeners, MultitrackLoadListener.LOAD_COMPLETE, null, false);
 
@@ -680 +683 @@
 
                 assert(!isPlaying());
-                assert(!isPlaybackPending);
                 assert(loadListeners != null);
                 assert(!loadListeners.isEmpty());
+                assert(!isPlaybackPending);
                 
                 startFramePosition = startFrame;
@@ -1141 +1144 @@
                                         loadFinished = true;
                                 }
+
+
+                                // Notify listener that load phase has completed
+                                notifyListeners(loadListeners, MultitrackLoadListener.LOAD_COMPLETE, null, false);
                                 
                                 // Remmember root frame of new playback
                                 currentODFrame = rootODFrame;
-                                
+
                                 commencePlayback(relativeStartFrame, startFrame, endFrame, loadListeners);