Changeset 1102 for trunk/src/org/apollo/io/SampledAudioFileImporter.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/io/SampledAudioFileImporter.java (modified) (2 diffs)

trunk/src/org/apollo/io/SampledAudioFileImporter.java

@@ -1 +1 @@
 package org.apollo.io;
 
-import java.awt.Point;
 import java.io.File;
 import java.io.IOException;
 
 import org.apollo.widgets.SampledTrack;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.Point;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.importer.FileImporter;
 import org.expeditee.items.Item;
@@ -18 +18 @@
 public class SampledAudioFileImporter implements FileImporter {
 
-        public Item importFile(File f, Point location) throws IOException {
-
-                if (location == null || !AudioIO.canImportFile(f) ||
-                                DisplayIO.getCurrentFrame() == null) return null;
+        public Item importFile(File f, Point location) throws IOException
+        {
+                if (location == null || !AudioIO.canImportFile(f) || DisplayController.getCurrentFrame() == null) return null;
                 
                 SampledTrack trackWidget = SampledTrack.createFromFile(
                                 f,
-                                DisplayIO.getCurrentFrame(), 
+                                DisplayController.getCurrentFrame(), 
                                 location.x, 
                                 location.y);
                 
                 // Add the sampled track widget to the current frame
-                DisplayIO.getCurrentFrame().addAllItems(trackWidget.getItems());
+                DisplayController.getCurrentFrame().addAllItems(trackWidget.getItems());
                 
                 return trackWidget.getSource(); // Don't allow for other importers to deal with this file