Changeset 1434 for trunk/src/org/apollo

Timestamp:

10/02/19 14:19:48 (5 years ago)

Author:

bln4

Message:

Implementation of ProfileManager. Refactor + additional content for how new profiles are created. The refactoring split out the creation of the default profile from user profiles. Refactoring revealed a long term bug that was causing user profiles to generate with incorrect information. The additional content fixed this bug by introducing the ${USER.NAME} variable, so that the default profile frameset can specify resource locations located in the users resource directory.

org.expeditee.auth.AuthenticatorBrowser
org.expeditee.auth.account.Create
org.expeditee.gui.Browser
org.expeditee.gui.management.ProfileManager
org.expeditee.setting.DirectoryListSetting
org.expeditee.setting.ListSetting
org.expeditee.settings.UserSettings

Implementation of ResourceManager as a core location to get resources from the file system. Also the additional variable ${CURRENT_FRAMESET} to represent the current frameset, so that images can be stored in the directory of the current frameset. This increases portability of framesets.

org.expeditee.gui.FrameIO
org.expeditee.gui.management.ResourceManager
org.expeditee.gui.management.ResourceUtil
Audio:

#NB: Audio used to only operate on a single directory. This has been updated to work in a same way as images. That is: when you ask for a specific resouce, it looks to the user settings to find a sequence of directories to look at in order until it manages to find the desired resource.

There is still need however for a single(ish) source of truth for the .banks and .mastermix file. Therefore these files are now always located in resource-<username>\audio.
org.apollo.agents.MelodySearch
org.apollo.audio.structure.AudioStructureModel
org.apollo.audio.util.MultiTrackPlaybackController
org.apollo.audio.util.SoundDesk
org.apollo.gui.FrameLayoutDaemon
org.apollo.io.AudioPathManager
org.apollo.util.AudioPurger
org.apollo.widgets.FramePlayer
org.apollo.widgets.SampledTrack

Images:

org.expeditee.items.ItemUtils

Frames:

org.expeditee.gui.FrameIO

Fixed a error in the FramePlayer class caused by an incorrect use of toArray().

org.apollo.widgets.FramePlayer

Added several short cut keys to allow for the Play/Pause (Ctrl + P), mute (Ctrl + M) and volume up/down (Ctrl + +/-) when hovering over SampledTrack widgets.

org.apollo.widgets.SampledTrack

Changed the way that Authenticate.login parses the new users profile to be more consistance with other similar places in code.

org.expeditee.auth.account.Authenticate

Encapsulated _body, _surrogateItemsBody and _primaryItemsBody in Frame class. Also changed getBody function to take a boolean flag as to if it should respect the current surrogate mode. If it should then it makes sure that labels have not changed since last time getBody was called.

org.expeditee.gui.Frame

Location:

trunk/src/org/apollo

Files:

• agents/MelodySearch.java (modified) (4 diffs)
• audio/structure/AudioStructureModel.java (modified) (3 diffs)
• audio/util/MultiTrackPlaybackController.java (modified) (3 diffs)
• audio/util/SoundDesk.java (modified) (1 diff)
• gui/FrameLayoutDaemon.java (modified) (3 diffs)
• io/AudioPathManager.java (modified) (7 diffs)
• util/AudioPurger.java (modified) (3 diffs)
• widgets/FramePlayer.java (modified) (3 diffs)
• widgets/SampledTrack.java (modified) (10 diffs)

trunk/src/org/apollo/agents/MelodySearch.java

@@ -11 +11 @@
 
 import org.apollo.ApolloSystem;
-import org.apollo.io.AudioPathManager;
 import org.apollo.meldex.DynamicProgrammingAlgorithm;
 import org.apollo.meldex.McNabMongeauSankoffAlgorithm;
@@ -28 +27 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.settings.folders.FolderSettings;
+import org.expeditee.gui.management.ResourceManager;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
@@ -34 +33 @@
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
+import org.expeditee.settings.folders.FolderSettings;
 
 /**
@@ -278 +278 @@
                                                 
                                                 // Get cached melody from file if it is up to date
-                                                String metaFilePath = 
-                                                        AudioPathManager.AUDIO_HOME_DIRECTORY 
-                                                        + MELODY_METAFILE_PREFIX
-                                                        + localFilename
-                                                        + MELODY_METAFILE_SUFFIX;
-                                                
-                                                File localFile = new File(AudioPathManager.AUDIO_HOME_DIRECTORY + localFilename);
+                                                String metaFileRelativePath = MELODY_METAFILE_PREFIX + localFilename + MELODY_METAFILE_SUFFIX;
+                                                String metaFilePath = ResourceManager.getAudioResource(metaFileRelativePath, DisplayController.getCurrentFrame()).getAbsolutePath();
+                                                
+                                                //File localFile = new File(AudioPathManager.AUDIO_HOME_DIRECTORY + localFilename);
+                                                File localFile = ResourceManager.getAudioResource(localFilename, DisplayController.getCurrentFrame());
                                                 if (!localFile.exists()) continue;
                                                 

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

@@ -16 +16 @@
 import org.apollo.audio.ApolloSubjectChangedEvent;
 import org.apollo.io.AudioIO;
-import org.apollo.io.AudioPathManager;
 import org.apollo.mvc.AbstractSubject;
 import org.apollo.mvc.SubjectChangedEvent;
@@ -30 +29 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
+import org.expeditee.gui.management.ResourceManager;
 import org.expeditee.io.Conversion;
 import org.expeditee.items.ItemUtils;
@@ -433 +433 @@
                                 try {
                                         
-                                        tmodel.runningTimeMS = AudioIO.getRunningTime(AudioPathManager.AUDIO_HOME_DIRECTORY + localFilename);
+                                        String localFilePath = ResourceManager.getAudioResource(localFilename, DisplayController.getCurrentFrame()).getAbsolutePath();
+                                        tmodel.runningTimeMS = AudioIO.getRunningTime(localFilePath);
                                 
                                 } catch (IOException e) {

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

@@ -20 +20 @@
 import org.apollo.audio.structure.TrackGraphLoopException;
 import org.apollo.audio.structure.TrackGraphNode;
-import org.apollo.io.AudioPathManager;
 import org.apollo.io.AudioIO.AudioFileLoader;
 import org.apollo.mvc.AbstractSubject;
@@ -34 +33 @@
 import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.DisplayObserver;
+import org.expeditee.gui.management.ResourceManager;
 
 public class MultiTrackPlaybackController 
@@ -1004 +1004 @@
                                                 
                                                 try {
+                                                        String filepath = ResourceManager.getAudioResource(absNode.getTrackNode().getLocalFilename(), DisplayController.getCurrentFrame()).getAbsolutePath();
                                                         stm = TrackModelLoadManager.getInstance().load(
-                                                                        AudioPathManager.AUDIO_HOME_DIRECTORY + absNode.getTrackNode().getLocalFilename(), 
+                                                                        filepath, 
                                                                         absNode.getTrackNode().getLocalFilename(), 
                                                                         new Observer() { // opps, my confusing design pattern gone wrong!

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

@@ -71 +71 @@
         
         /** Where the mixes are saved to. */
-        private static final String MIX_BANKS_FILEPATH = AudioPathManager.AUDIO_HOME_DIRECTORY + ".banks";
-        
-        private static final String MASTER_MIX_FILEPATH = AudioPathManager.AUDIO_HOME_DIRECTORY + ".mastermix";
+        private static final String MIX_BANKS_FILEPATH = AudioPathManager.AUDIO_USERNAME_HOME_DIRECTORY + ".banks";
+        
+        private static final String MASTER_MIX_FILEPATH = AudioPathManager.AUDIO_USERNAME_HOME_DIRECTORY + ".mastermix";
         
         private static final String NO_SOLO_PREFIX = "~#SOLOOFF#~";

trunk/src/org/apollo/gui/FrameLayoutDaemon.java

@@ -15 +15 @@
 import org.apollo.audio.util.Timeline;
 import org.apollo.io.AudioIO;
-import org.apollo.io.AudioPathManager;
 import org.apollo.mvc.AbstractSubject;
 import org.apollo.mvc.Observer;
@@ -32 +31 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FreeItems;
+import org.expeditee.gui.management.ResourceManager;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
@@ -766 +766 @@
                                 // so cann afford to hang the thread a little for checking the actual time...
                                 if (runningTime <= 0) {
-                                        File f = new File(AudioPathManager.AUDIO_HOME_DIRECTORY +
-                                                        sampledTrackWidget.getLocalFileName());
+                                        //File f = new File(AudioPathManager.AUDIO_HOME_DIRECTORY +
+                                        //              sampledTrackWidget.getLocalFileName());
+                                        File f = ResourceManager.getAudioResource(sampledTrackWidget.getLocalFileName(), DisplayController.getCurrentFrame());
                                         if (f.exists()) {
                                                 try {

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

@@ -7 +7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
+import java.util.function.Predicate;
 
 import org.apollo.audio.structure.AudioStructureModel;
 import org.apollo.util.ApolloSystemLog;
 import org.apollo.util.RegExpFileFilter;
-import org.expeditee.auth.AuthenticatorBrowser;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.FrameIO;
+import org.expeditee.gui.management.ResourceManager;
 import org.expeditee.settings.UserSettings;
 
@@ -29 +33 @@
 
         /** Suffixed with the native file separator */
-        public static String AUDIO_HOME_DIRECTORY = null;
+        public static String AUDIO_USERNAME_HOME_DIRECTORY = null;
         
         /** Stores all virtual names created by this repository. */
@@ -39 +43 @@
 
         private static Random rand = new Random(System.currentTimeMillis());
-
-        // **** DB
-        // Some work to be done here => remove dependency in code on 'AUDIO_HOME_DIRECTORY'
-        // and change it to use audio dir list from UserSettings
-        public static void changeParentAndSubFolders(String newFolder) {
-                
-                if (AuthenticatorBrowser.isAuthenticationRequired() && System.getProperty("user.name").equals(AuthenticatorBrowser.USER_NOBODY)) {
-                        System.err.println("**** AudioPathManager::changeParentAndSubFolder(): Nothing to do for user '" + AuthenticatorBrowser.USER_NOBODY + "'");
-                        return;
-                }
-                
-                if (UserSettings.PublicAndPrivateResources) {
-                        //String resourcesPublicPath = FrameIO.PARENT_FOLDER + "resources-public" + File.separator;
-                        String userName = UserSettings.UserName.get();
-                        //String resourcesPrivateIndividualPath = FrameIO.PARENT_FOLDER + "resources-" + userName + File.separator;
-                        if (AuthenticatorBrowser.isAuthenticationRequired()) {
-                                System.err.println("**** AudioPathManager::changeParentAndSubFolder(): Setting 'audio' folder to resources-" + userName);
-                        }
-                        //AUDIO_HOME_DIRECTORY = resourcesPrivateIndividualPath + "audio" + File.separatorChar;
-                        AUDIO_HOME_DIRECTORY = FrameIO.AUDIO_PRIVATE_PATH;
-                }
-                else {
-                        AUDIO_HOME_DIRECTORY = FrameIO.PARENT_FOLDER + "audio" + File.separatorChar;;
-                }
-        }
-        
-        public static void activateAndScanAudioDir()
-        {
-                changeParentAndSubFolders(FrameIO.PARENT_FOLDER);
-                
-                // Ensure audio directory exists
-                File dir = new File(AUDIO_HOME_DIRECTORY);
-                if (!dir.exists()) {
-                        if (!dir.mkdir()) {
-                                ApolloSystemLog.println("Unable to create missing audio home directory");
-                        }
-                }
-
+        
+        // TODO: this function called during startup?  In browser construction?  When FrameIO.changeParentAndSubFolders() is called?  Separation of apollo from expeditee core?
+        public static void activateAndScanAudioDirs() {
+                // If we are in old regime then there is no AUDIO_USERNAME_PRIVATE_PATH.
+                AUDIO_USERNAME_HOME_DIRECTORY = FrameIO.AUDIO_USERNAME_PRIVATE_PATH == null ? FrameIO.AUDIO_PATH : FrameIO.AUDIO_USERNAME_PRIVATE_PATH;
+                
                 // Load counter
-                loadCounter(AUDIO_HOME_DIRECTORY);
-        }
-        
+                loadCounter();
+        }
         
         /**
          * Loads the counter
-         * @param dir The dir where the audio files live.
-         */
-        private static void loadCounter(String audio_dir_str) {
-                File audio_dir = new File(audio_dir_str);
-                
-                String[] files = getAudioFileNames(audio_dir);
-                if (files == null) { // Due to IO exception
-                        ApolloSystemLog.printError("Failed to read audio directory");
-                        return;
-                }
+         */
+        private static void loadCounter() {
+                List<String> audioFileNames = getAudioFileNames();
+                
                 long count = 0;
-                if (files != null) {
-                        for (String f : files) {
-        
-                                int start = -1, end = -1;
-                                for (int i = 0; i < f.length(); i++) {
-                                        if (Character.isDigit(f.charAt(i)) && start == -1) {
-                                                start = i;
-                                        } else if (!Character.isDigit(f.charAt(i)) && start != -1) {
-                                                end = i;
-                                                break;
-                                        }
-                                }
-                                
-                                if (start >= 0 && end == -1) {
-                                        end = f.length();
-                                }
-        
-                                if (start > 0 && end >= start) { // not start >= 0 since missing preable
-        
-                                        String tmp = f.substring(start, end);
-                                        long l = Long.parseLong(tmp);
-                                        if (l >= count)
-                                                count = l + 1;
-                                }
-                        }
-                }
-
+                for (String f : audioFileNames) {
+                        
+                        int start = -1, end = -1;
+                        for (int i = 0; i < f.length(); i++) {
+                                if (Character.isDigit(f.charAt(i)) && start == -1) {
+                                        start = i;
+                                } else if (!Character.isDigit(f.charAt(i)) && start != -1) {
+                                        end = i;
+                                        break;
+                                }
+                        }
+                        
+                        if (start >= 0 && end == -1) {
+                                end = f.length();
+                        }
+
+                        if (start > 0 && end >= start) { // not start >= 0 since missing preable
+
+                                String tmp = f.substring(start, end);
+                                long l = Long.parseLong(tmp);
+                                if (l >= count)
+                                        count = l + 1;
+                        }
+                }
                 counter = count;
-        }
-        
-        /**
-         * @param dir
-         * @return
-         *              Null if an IO exception occurs
-         */
-        private static String[] getAudioFileNames(File dir) {
-                return dir.list(new RegExpFileFilter("^[A-Z]+\\d+.*$"));
         }
         
@@ -140 +93 @@
          *              read list of files.
          */
-        public static String[] getAudioFileNames() {
-                File audioDir = new File(AUDIO_HOME_DIRECTORY);
-                if (!audioDir.exists() || !audioDir.isDirectory()) return null;
-                return getAudioFileNames(audioDir);
+        public static List<String> getAudioFileNames() {
+                Predicate<File> isFile = file -> {
+                        File dirForFile = file.toPath().getParent().toFile();
+                        if (!dirForFile.exists()) {
+                                if (!dirForFile.mkdir()) {
+                                        ApolloSystemLog.println("Unable to create missing audio directory: " + dirForFile.toString());
+                                }
+                        }
+                        if (file.isFile()) {
+                                return true;
+                        }
+                        return false;
+                };              
+                List<File> allFilesInAudioDirectories = ResourceManager.gatherAudioResources(isFile, DisplayController.getCurrentFrame());
+                List<String> audioFileNames = new ArrayList<String>(); 
+                RegExpFileFilter regExpFileFilter = new RegExpFileFilter("^[A-Z]+\\d+.*$");
+                for (File file: allFilesInAudioDirectories) {
+                        if (regExpFileFilter.accept(file, file.getAbsolutePath())) {
+                                audioFileNames.add(file.getName());
+                        }
+                }
+                return audioFileNames;
         }
         
@@ -168 +139 @@
                 String filename = generateRandomFilenameBase() + "." + extension;
                 
-                File f = new File(AUDIO_HOME_DIRECTORY + filename);
+                File f = new File(AUDIO_USERNAME_HOME_DIRECTORY + filename);
 
                 if (AudioStructureModel.getInstance().getTrackGraphInfo(filename, null) != null ||
@@ -206 +177 @@
 
                 // Build the filename string
-                return preamble + counter;
+                return UserSettings.UserName.get() + preamble + counter;
                 
         }
@@ -222 +193 @@
 
                 // Ensure that the name base file exists. Assumes the audio home directory exists.
-                File vnameBase = new File(AUDIO_HOME_DIRECTORY + VIRTUAL_NAME_BASEFILE);
+                File vnameBase = new File(AUDIO_USERNAME_HOME_DIRECTORY + VIRTUAL_NAME_BASEFILE);
                 if (!vnameBase.exists()) {
                         try {

trunk/src/org/apollo/util/AudioPurger.java

@@ -11 +11 @@
 import org.apollo.widgets.SampledTrack;
 import org.expeditee.settings.folders.FolderSettings;
+import org.expeditee.gui.DisplayController;
+import org.expeditee.gui.management.ResourceManager;
 import org.expeditee.items.ItemUtils;
 
@@ -26 +28 @@
         public static void purgeLocalAudio() {
                 
-                String[] audioFiles = AudioPathManager.getAudioFileNames();
-                if (audioFiles == null || audioFiles.length == 0) return;
+                List<String> audioFiles = AudioPathManager.getAudioFileNames();
+                if (audioFiles == null || audioFiles.size() == 0) return;
                 
                 
@@ -50 +52 @@
                 for (String audioFile : audioFiles) {
                         if (!referencedAudio.contains(audioFile)) {
-                                
-                                File unreferencedFile = new File(AudioPathManager.AUDIO_HOME_DIRECTORY + audioFile);
+                                File unreferencedFile = ResourceManager.getAudioResource(audioFile, DisplayController.getCurrentFrame());
+                                //File unreferencedFile = new File(AudioPathManager.AUDIO_HOME_DIRECTORY + audioFile);
                                 ApolloSystemLog.println("Deleting unreference audio file \"" + audioFile + "\"");
                                 unreferencedFile.delete();
                                 
                                 // Also delete any melody meta
-                                File melodyMetaFile = new File(
-                                                AudioPathManager.AUDIO_HOME_DIRECTORY +
-                                                MelodySearch.MELODY_METAFILE_PREFIX + 
-                                                audioFile +
-                                                MelodySearch.MELODY_METAFILE_SUFFIX);
+                                String melodyFileName = MelodySearch.MELODY_METAFILE_PREFIX + audioFile + MelodySearch.MELODY_METAFILE_SUFFIX;
+                                File melodyMetaFile = ResourceManager.getAudioResource(melodyFileName, DisplayController.getCurrentFrame());
                                 
                                 if (melodyMetaFile.exists()) melodyMetaFile.delete();

trunk/src/org/apollo/widgets/FramePlayer.java

@@ -107 +107 @@
                 
                 // Read typed frames
-                File f = new File(AudioPathManager.AUDIO_HOME_DIRECTORY + TYPED_FRAMED_HISTORY_FILE);
+                File f = new File(AudioPathManager.AUDIO_USERNAME_HOME_DIRECTORY + TYPED_FRAMED_HISTORY_FILE);
                 if (f.exists()) {
                         BufferedReader in = null;
@@ -147 +147 @@
                 try {
                         // Open the vbase for appending
-                        out = new FileWriter(AudioPathManager.AUDIO_HOME_DIRECTORY + TYPED_FRAMED_HISTORY_FILE, false); 
+                        out = new FileWriter(AudioPathManager.AUDIO_USERNAME_HOME_DIRECTORY + TYPED_FRAMED_HISTORY_FILE, false); 
                         for (String str : typedFrameNames) {
                                 out.write(str + "\n");
@@ -802 +802 @@
                 }
                 
-            ComboBoxModel<String> model = new DefaultComboBoxModel<String>((String[]) orderedModelData.toArray());
+            ComboBoxModel<String> model = new DefaultComboBoxModel<String>((String[]) orderedModelData.toArray(new String[] {}));
+                //ComboBoxModel model = new DefaultComboBoxModel(orderedModelData.toArray());
             
             // Remove helper tags from model data

trunk/src/org/apollo/widgets/SampledTrack.java

@@ -23 +23 @@
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.UnsupportedAudioFileException;
+import javax.swing.JSlider;
 import javax.swing.SwingUtilities;
 
@@ -70 +71 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.PopupManager;
+import org.expeditee.gui.management.ResourceManager;
 import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.ItemUtils;
@@ -401 +403 @@
                 
                 });
-                
+                                
                 fulltrackView.addKeyListener(new KeyListener() {
 
                         @Override
-                        public void keyPressed(KeyEvent e)
-                        {
+                        public void keyPressed(KeyEvent e) {
                         }
 
                         @Override
-                        public void keyReleased(KeyEvent e)
-                        {
+                        public void keyReleased(KeyEvent e)     {
+                                
+                                // On 26th September, Bryce added P M + - keys to play/pause/resume, mute and adjust volume. 
+                                if (e.isControlDown() && e.getKeyCode() == KeyEvent.VK_P) {
+                                        try {
+                                                playbackControlPopup.playPauseResume();
+                                        } catch (LineUnavailableException e1) {
+                                                e1.printStackTrace();
+                                        }
+                                } else if (e.isControlDown() && e.getKeyCode() == KeyEvent.VK_M) {
+                                        boolean selected = playbackControlPopup.muteButton.isSelected();
+                                        playbackControlPopup.muteButton.setSelected(!selected);
+                                        playbackControlPopup.muteChanged();
+                                } else if (e.isControlDown() && e.getKeyCode() == KeyEvent.VK_SUBTRACT) {
+                                        JSlider volumeSlider = playbackControlPopup.volumeSlider;
+                                        int delta = Math.round(((float) (volumeSlider.getMaximum() - volumeSlider.getMinimum())) / 10f);
+                                        int newVolume = Math.max(volumeSlider.getValue() - delta, volumeSlider.getMinimum());
+                                        volumeSlider.setValue(newVolume);
+                                        playbackControlPopup.volumeChanged();
+                                } else if (e.isControlDown() && e.getKeyCode() == KeyEvent.VK_ADD) {
+                                        JSlider volumeSlider = playbackControlPopup.volumeSlider;
+                                        int delta = Math.round(((float) (volumeSlider.getMaximum() - volumeSlider.getMinimum())) / 10f);
+                                        int newVolume = Math.min(volumeSlider.getValue() + delta, volumeSlider.getMaximum());
+                                        volumeSlider.setValue(newVolume);
+                                        playbackControlPopup.volumeChanged();
+                                }
+                                
                                 // Toggle pitch-track indexing
-                                if (e.isControlDown() && e.getKeyCode() == KeyEvent.VK_I) {
+                                else if (e.isControlDown() && e.getKeyCode() == KeyEvent.VK_I) {
                                         setShouldOmitIndexAudio(!shouldOmitIndexAudio());
                                         DisplayController.requestRefresh(true);
@@ -765 +791 @@
                                 setLoadScreenMessage("Loading audio file...");
                                 
-                                f = new File(
-                                                AudioPathManager.AUDIO_HOME_DIRECTORY + localFileName);
+                                //f = new File(
+                                //              AudioPathManager.AUDIO_HOME_DIRECTORY + localFileName);
+                                f = ResourceManager.getAudioResource(localFileName, getParentFrame());
                         }
                         
@@ -809 +836 @@
                                         // If recovering - might be recovering an existing track that had been
                                         // saved to the repository .. thus re-use the old file
-                                        trackModel.setFilepath(AudioPathManager.AUDIO_HOME_DIRECTORY + localFileName);
+                                        File audioResource = ResourceManager.getAudioResource(localFileName, getParentFrame());
+                                        trackModel.setFilepath(audioResource.getAbsolutePath());
                                 }
                                 
@@ -940 +968 @@
                 // If saving for the file time then get a filename
                 if (trackModel.getFilepath() == null) {
-                        trackModel.setFilepath(AudioPathManager.AUDIO_HOME_DIRECTORY + localFileName);
+                        File audioResource = ResourceManager.getAudioResource(localFileName, DisplayController.getCurrentFrame());
+                        trackModel.setFilepath(audioResource.getAbsolutePath());
                         loadFilenameArgument = localFileName; // set to now local, next load will be local
                 }
@@ -1029 +1058 @@
                 
                 // Get rid of local file
-                File oldLocalFile = new File(AudioPathManager.AUDIO_HOME_DIRECTORY + localFileName);
+                //File oldLocalFile = new File(AudioPathManager.AUDIO_HOME_DIRECTORY + localFileName);
+                File oldLocalFile = ResourceManager.getAudioResource(localFileName, getParentFrame());
                 if (oldLocalFile.isFile() && oldLocalFile.exists()) {
                         try {
@@ -1157 +1187 @@
                         return recoveryFile.getAbsolutePath();
                 }
-                        
-                return AudioPathManager.AUDIO_HOME_DIRECTORY + localFileName;
+                
+                File audioResource = ResourceManager.getAudioResource(localFileName, getParentFrame());                 
+                return audioResource.getAbsolutePath();
                 
                 
@@ -2005 +2036 @@
                                 try {
         
-                                        if (!SoundDesk.getInstance().isPlaying(trackMix.getChannelID())) { // play / resume
-                                                
-                                                int startFrame = -1, endFrame = -1;
-                                                
-                                                // Resume playback?
-                                                if (SoundDesk.getInstance().isPaused(trackMix.getChannelID())) {
-                                                        startFrame = SoundDesk.getInstance().getLastPlayedFramePosition(trackMix.getChannelID());
-                                                        if (startFrame >= 0 && startFrame < trackModel.getFrameCount()) {
-                                
-                                                                // The user may have edited the audio track and reselected it
-                                                                // since the last pause. Thus select an appropriate end frame
-                                                                endFrame = (trackModel.getSelectionLength() > 1) ?
-                                                                                trackModel.getSelectionStart() + trackModel.getSelectionLength():
-                                                                                        trackModel.getFrameCount() - 1;
-                                                                        
-                                                                // Changed selection? it play range invalid?
-                                                                if (endFrame <= startFrame || startFrame < trackModel.getSelectionStart()) {
-                                                                        startFrame = -1; // Play new selection (see below)
-                                                                
-                                                                } else if (endFrame >= trackModel.getFrameCount()) {
-                                                                        endFrame = trackModel.getFrameCount() - 1;
-                                                                }               
-                                                                
-                                                        }
-                                                }
-                                                
-                                                // Play from beginning of selection to end of selection
-                                                if (startFrame < 0) {
-                                                        startFrame = trackModel.getSelectionStart();
-                                                        endFrame = (trackModel.getSelectionLength() > 1) ?
-                                                                        startFrame + trackModel.getSelectionLength():
-                                                                                trackModel.getFrameCount() - 1;
-                                                }
-        
-                                                // Safety clamp:
-                                                if (endFrame >= trackModel.getFrameCount()) {
-                                                        endFrame = trackModel.getFrameCount() - 1;
-                                                }       
-                                                
-                                                if (startFrame < endFrame) {
-                                                        SoundDesk.getInstance().playSampledTrackModel(
-                                                                        trackModel, 
-                                                                        trackMix.getChannelID(), 
-                                                                        startFrame, 
-                                                                        endFrame, 
-                                                                        0);
-                                                }
-        
-                                        } else { // pause
-                                                
-                                                TrackSequence ts = SoundDesk.getInstance().getTrackSequence(trackMix.getChannelID());
-
-                                                if (ts != null &&
-                                                                ts.isPlaying()) {
-                                                        
-                                                        // Mark channel as paused.
-                                                        SoundDesk.getInstance().setPaused(trackMix.getChannelID(), true);
-                                                        
-                                                        // Stop playback for this channel
-                                                        ApolloPlaybackMixer.getInstance().stop(ts);
-                                                        
-                                                }
-                                                
-                                        }
+                                        playPauseResume();
                                         
                                 } catch (LineUnavailableException e1) {
@@ -2094 +2062 @@
                         } else if (e.getSource() == miscButton) {
                                 expand(false);
+                        }
+                }
+
+                private void playPauseResume() throws LineUnavailableException {
+                        if (!SoundDesk.getInstance().isPlaying(trackMix.getChannelID())) { // play / resume
+                                
+                                int startFrame = -1, endFrame = -1;
+                                
+                                // Resume playback?
+                                if (SoundDesk.getInstance().isPaused(trackMix.getChannelID())) {
+                                        startFrame = SoundDesk.getInstance().getLastPlayedFramePosition(trackMix.getChannelID());
+                                        if (startFrame >= 0 && startFrame < trackModel.getFrameCount()) {
+
+                                                // The user may have edited the audio track and reselected it
+                                                // since the last pause. Thus select an appropriate end frame
+                                                endFrame = (trackModel.getSelectionLength() > 1) ?
+                                                                trackModel.getSelectionStart() + trackModel.getSelectionLength():
+                                                                        trackModel.getFrameCount() - 1;
+                                                        
+                                                // Changed selection? it play range invalid?
+                                                if (endFrame <= startFrame || startFrame < trackModel.getSelectionStart()) {
+                                                        startFrame = -1; // Play new selection (see below)
+                                                
+                                                } else if (endFrame >= trackModel.getFrameCount()) {
+                                                        endFrame = trackModel.getFrameCount() - 1;
+                                                }               
+                                                
+                                        }
+                                }
+                                
+                                // Play from beginning of selection to end of selection
+                                if (startFrame < 0) {
+                                        startFrame = trackModel.getSelectionStart();
+                                        endFrame = (trackModel.getSelectionLength() > 1) ?
+                                                        startFrame + trackModel.getSelectionLength():
+                                                                trackModel.getFrameCount() - 1;
+                                }
+
+                                // Safety clamp:
+                                if (endFrame >= trackModel.getFrameCount()) {
+                                        endFrame = trackModel.getFrameCount() - 1;
+                                }       
+                                
+                                if (startFrame < endFrame) {
+                                        SoundDesk.getInstance().playSampledTrackModel(
+                                                        trackModel, 
+                                                        trackMix.getChannelID(), 
+                                                        startFrame, 
+                                                        endFrame, 
+                                                        0);
+                                }
+
+                        } else { // pause
+                                
+                                TrackSequence ts = SoundDesk.getInstance().getTrackSequence(trackMix.getChannelID());
+
+                                if (ts != null &&
+                                                ts.isPlaying()) {
+                                        
+                                        // Mark channel as paused.
+                                        SoundDesk.getInstance().setPaused(trackMix.getChannelID(), true);
+                                        
+                                        // Stop playback for this channel
+                                        ApolloPlaybackMixer.getInstance().stop(ts);
+                                        
+                                }
+                                
                         }
                 }