Changeset 1102 for trunk/src/org/apollo/audio/util/MultiTrackPlaybackController.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/apollo/audio/util/MultiTrackPlaybackController.java (modified) (9 diffs)

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

@@ -9 +9 @@
 
 import javax.sound.sampled.LineUnavailableException;
-import javax.swing.SwingUtilities;
 
 import org.apollo.audio.ApolloPlaybackMixer;
@@ -31 +30 @@
 import org.apollo.util.TrackModelHandler;
 import org.apollo.util.TrackModelLoadManager;
-import org.expeditee.gui.DisplayIO;
-import org.expeditee.gui.DisplayIOObserver;
-
+import org.expeditee.core.BlockingRunnable;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gui.DisplayController;
+import org.expeditee.gui.DisplayObserver;
 
 public class MultiTrackPlaybackController 
         extends AbstractSubject 
-        implements TrackModelHandler, Observer, DisplayIOObserver {
+        implements TrackModelHandler, Observer, DisplayObserver {
         
         /** Can be a framename or virtual filename (e.g. from a linked track) */
@@ -91 +91 @@
                 // After a certain amount of frame changes since the last multi playback has occured
                 // the cached track models are freed to stop consuming all the memory.
-                DisplayIO.addDisplayIOObserver(this);
+                DisplayController.addDisplayObserver(this);
                 
                 // For whenever a track sequence is created - must observe the created track sequences...
@@ -295 +295 @@
          */
         public void frameChanged() {
-                if (hasTrackCacheExpired() || isPlaying() || isLoading() || DisplayIO.getCurrentFrame() == null) return; // already expired - or is playing - so don't expire!
-                
-                String currentFrameName = DisplayIO.getCurrentFrame().getName();
+                if (hasTrackCacheExpired() || isPlaying() || isLoading() || DisplayController.getCurrentFrame() == null) return; // already expired - or is playing - so don't expire!
+                
+                String currentFrameName = DisplayController.getCurrentFrame().getName();
                 
                 // Free track group every so often.. 
@@ -785 +785 @@
                         final int id1 = id; 
                         final Object state1 = state;
-                        SwingUtilities.invokeLater(new Runnable() {
+                        EcosystemManager.getMiscManager().runOnGIOThread(new Runnable() {
                                 public void run() {
                                         synchronized(listeners1) {
@@ -919 +919 @@
         
                                 try {
-                                        SwingUtilities.invokeAndWait(absTrackGraphRetreiver);
+                                        EcosystemManager.getMiscManager().runOnGIOThread(absTrackGraphRetreiver);
                                 } catch (Exception e) {
                                         notifyListeners(loadListeners, MultitrackLoadListener.LOAD_FAILED_GENERIC, e, true);
@@ -1095 +1095 @@
 
                         // Must commence on the swing thread
-                        SwingUtilities.invokeLater(new MultiTrackPlaybackCommencer());
+                        EcosystemManager.getMiscManager().runOnGIOThread(new MultiTrackPlaybackCommencer());
                 }
                 
@@ -1154 +1154 @@
                  * @author Brook Novak
                  */
-                private class ABSTrackGraphRetreiver implements Runnable {
+                private class ABSTrackGraphRetreiver extends BlockingRunnable {
                         
                         private String masterMixID;
@@ -1165 +1165 @@
                         }
                         
-                        public void run() {
+                        public void execute() {
                                 assert(rootODFrame != null);
                                 assert(masterMixID != null);