Changeset 1102 for trunk/src/org/apollo/audio/structure/AudioStructureModel.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/structure/AudioStructureModel.java (modified) (15 diffs)

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

@@ -3 +3 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -14 +13 @@
 
 import javax.sound.sampled.UnsupportedAudioFileException;
-import javax.swing.SwingUtilities;
 
 import org.apollo.audio.ApolloSubjectChangedEvent;
@@ -27 +25 @@
 import org.apollo.widgets.SampledTrack;
 import org.apollo.widgets.TrackWidgetCommons;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.BlockingRunnable;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.settings.UserSettings;
 import org.expeditee.io.Conversion;
 import org.expeditee.items.ItemUtils;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.Widget;
 import org.expeditee.settings.folders.FolderSettings;
 
 /**
- * A thread safe model of the heirarchical structure of a track graph...
+ * A thread safe model of the hierarchical structure of a track graph...
  * abstracted from Expeditee frames and audio widgets.
  * 
- * The track widgets notifty this model for keeping the structure consistent with
- * expeditees data.
+ * The track widgets notify this model for keeping the structure consistent with
+ * Expeditee's data.
  * 
  * 
@@ -199 +197 @@
                 NewGraphCommitor commit = new NewGraphCommitor(rootODFrame, newGraph);
                 try {
-                        SwingUtilities.invokeAndWait(commit);
-                } catch (InvocationTargetException e) {
+                        EcosystemManager.getMiscManager().runOnGIOThread(commit);
+                } catch (Exception e) {
                         e.printStackTrace();
                         assert(false);
@@ -264 +262 @@
                 
                 try {
-                        SwingUtilities.invokeAndWait(cacheFetch);
-                } catch (InvocationTargetException e) {
+                        EcosystemManager.getMiscManager().runOnGIOThread(cacheFetch);
+                } catch (Exception e) {
                         e.printStackTrace();
                         assert(false);
@@ -562 +560 @@
          *
          */
-        private class ExpediteeCachedTrackInfoFetcher implements Runnable
+        private class ExpediteeCachedTrackInfoFetcher extends BlockingRunnable
         {
                 private String rootFrameName;
@@ -578 +576 @@
                 }
                 
-                public void run()
+                public void execute()
                 {
                         assert(rootFrameName != null);
@@ -584 +582 @@
                         // Check if the current frame
                         Frame rootFrame = null;
-                        if (DisplayIO.getCurrentFrame() != null && DisplayIO.getCurrentFrame().getName() != null
-                                        && DisplayIO.getCurrentFrame().getName().equals(rootFrameName)) {
-                                rootFrame = DisplayIO.getCurrentFrame();
+                        if (DisplayController.getCurrentFrame() != null && DisplayController.getCurrentFrame().getName() != null
+                                        && DisplayController.getCurrentFrame().getName().equals(rootFrameName)) {
+                                rootFrame = DisplayController.getCurrentFrame();
                         } else {
                                 // Check if in cache
@@ -597 +595 @@
                                 linkedTracks =  new HashMap<String, LinkedTrackModelData>();
                                 
-                                for (InteractiveWidget iw : rootFrame.getInteractiveWidgets()) {
+                                for (Widget iw : rootFrame.getInteractiveWidgets()) {
                                         
                                         if (iw instanceof SampledTrack) {
@@ -668 +666 @@
          *
          */
-        private class NewGraphCommitor implements Runnable
+        private class NewGraphCommitor extends BlockingRunnable
         {
                 private final OverdubbedFrame rootODFrame;
@@ -687 +685 @@
                 }
                 
-                public void run()
+                public void execute()
                 {
                         
@@ -1083 +1081 @@
                 synchronized(sharedResourceLocker) { // IMPORTANT: Must wait for new graphs to be added to the shared resources
 
-                        if (FrameGraphics.isXRayMode()) { // discard whole model
+                        if (DisplayController.isXRayMode()) { // discard whole model
 
                                 // Neccessary because if the user goes into xray then moves to a new frame
@@ -1422 +1420 @@
 
         
-                        if (FrameGraphics.isXRayMode()) { // discard whole model
+                        if (DisplayController.isXRayMode()) { // discard whole model
 
                                 // Neccessary because if the user goes into xray then moves to a new frame
@@ -1610 +1608 @@
                                                 
                                                 try {
-                                                        SwingUtilities.invokeAndWait(new Runnable() {
+                                                        EcosystemManager.getMiscManager().runOnGIOThread(new BlockingRunnable() {
                                                                 
-                                                                public void run() { // on swing thread
+                                                                public void execute() { // on swing thread
 
                                                                         synchronized(sharedResourceLocker) {
@@ -1672 +1670 @@
                                                                 }
                                                         });
-                                                } catch (InvocationTargetException e) {
+                                                } catch (Exception e) {
                                                         e.printStackTrace();
                                                         assert(false);