Changeset 359

Timestamp:

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

Author:

bjn8

Message:

Fixed bug with resetting initiation times on audio with negative times

Location:

trunk/src_apollo/org/apollo

Files:

• audio/structure/AudioStructureModel.java (modified) (1 diff)
• widgets/SampledTrack.java (modified) (2 diffs)

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

@@ -608 +608 @@
                                                 NullableLong initTime = (tinf != null) ? new NullableLong(tinf.getInitiationTime()) :
                                                         NullableLong.fromLong(sampledTrackWidget.getInitiationTimeFromMeta());
-                                                if (initTime != null && initTime.getLongValue() < 0) initTime = null; // signify to load default from frame
-                                                
+
                                                 long runningTime = sampledTrackWidget.getRunningMSTimeFromRawAudio();
                                                 if (runningTime <= 0) runningTime = -1; // signify to load from file

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

@@ -803 +803 @@
                         // Nullify
                         if (!f.exists() || !f.isFile()) f = null;
-                
-                        
+
                 }
 
@@ -1056 +1055 @@
                 // Dump memory to a temp file
                 try {
+                        
                         // Always be unique
                         String uniqueID = AudioPathManager.generateLocateFileName("wav");
                         recoveryFile = File.createTempFile("APOLLO_BACKUP" + uniqueID, null);
+                        
+                        // To avoid filling up the end-users hardisk, mark file to be
+                        // deleted on exit (if not already deleted).
+                        recoveryFile.deleteOnExit();
                 
                 } catch (IOException e) {