Changeset 358

Timestamp:

10/10/08 10:00:23 (16 years ago)

Author:

bjn8

Message:

Improved deletion so that audio is always dumped to a recovery file - avoids filling up HD with abandoned audio

File:

• trunk/src_apollo/org/apollo/widgets/SampledTrack.java (modified) (1 diff)

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

@@ -785 +785 @@
                 if (f == null) { // must be importing or loading from local repository
 
-                        if (loadFilenameArgument != null) {
-                                
-                                if (loadFilenameArgument.startsWith(ARG_IMPORT_TAG)) { // importing a file?
-                                        
-                                        setLoadScreenMessage("Importing audio file...");
-                                        
-                                        isImporting = true;
-                                        f = new File(loadFilenameArgument.substring(ARG_IMPORT_TAG.length()));
-                                        
-                                } else { // local
-                                        assert(loadFilenameArgument == localFileName);
-                                        
-                                        setLoadScreenMessage("Loading audio file...");
-                                        
-                                        f = new File(
-                                                        AudioPathManager.AUDIO_HOME_DIRECTORY + localFileName);
-                                }
-                                
-                                // Nullify
-                                if (!f.exists() || !f.isFile()) f = null;
-                        } 
+                        if (loadFilenameArgument != null && loadFilenameArgument.startsWith(ARG_IMPORT_TAG)) { // importing a file?
+                                
+                                setLoadScreenMessage("Importing audio file...");
+                                
+                                isImporting = true;
+                                f = new File(loadFilenameArgument.substring(ARG_IMPORT_TAG.length()));
+                                
+                        } else { // local
+                                assert(loadFilenameArgument == null || loadFilenameArgument == localFileName);
+                                
+                                setLoadScreenMessage("Loading audio file...");
+                                
+                                f = new File(
+                                                AudioPathManager.AUDIO_HOME_DIRECTORY + localFileName);
+                        }
+                        
+                        // Nullify
+                        if (!f.exists() || !f.isFile()) f = null;
+                
                         
                 }