Changeset 544 for trunk

Timestamp:

06/15/09 23:02:41 (15 years ago)

Author:

Nicholas Riley

Message:

Don't keep QTMovies around (and corresponding files open) for pending alarms; we could run out of file handles this way.

Location:

trunk/Cocoa/Pester/Source

Files:

• PSMediaAlert.h (modified) (1 diff)
• PSMediaAlert.m (modified) (1 diff)
• PSMovieAlert.h (modified) (1 diff)
• PSMovieAlert.m (modified) (7 diffs)

trunk/Cocoa/Pester/Source/PSMediaAlert.h

@@ -9 +9 @@
 #import "PSAlert.h"
 
+extern const float PSMediaAlertNoVolume;
 
 @interface PSMediaAlert : PSAlert {

trunk/Cocoa/Pester/Source/PSMediaAlert.m

@@ -15 +15 @@
 static NSString * const PLAlertOutputVolume = @"volume"; // NSNumber
 
-static const float PSMediaAlertNoVolume = 0;
+const float PSMediaAlertNoVolume = 0;
 
 @implementation PSMediaAlert

trunk/Cocoa/Pester/Source/PSMovieAlert.h

@@ -8 +8 @@
 
 #import <AppKit/AppKit.h>
-#import <QTKit/QTKit.h>
 #import "PSMediaAlert.h"
 
 @class BDAlias;
+@class QTMovie;
 
 @interface PSMovieAlert : PSMediaAlert {
     BDAlias *alias;
-    QTMovie *movie;
     BOOL hasAudio;
     BOOL hasVideo;

trunk/Cocoa/Pester/Source/PSMovieAlert.m

@@ -7 +7 @@
 //
 
+#import <QTKit/QTKit.h>
 #import <QuickTime/Movies.h>
 #import "PSMovieAlert.h"
@@ -35 +36 @@
         alias = [anAlias retain];
         repetitions = numReps;
-        // XXX if we support remote movie URLs, need to call EnterMovies() ourselves at least in Jaguar (_MacTech_ December 2002, p. 64); also should do async movie loading (p. 73Ð74).
-        movie = [[QTMovie alloc] initWithFile: path error: NULL];
+        QTMovie *movie = [[QTMovie alloc] initWithFile: path error: NULL];
         if (movie == nil) {
             [self release];
@@ -48 +48 @@
             }
         }
+        [movie release];
     }
     
@@ -65 +66 @@
 - (QTMovie *)movie;
 {
-    return movie;
+    NSString *path = [alias fullPath];
+    if (path == nil)
+        return nil;
+    
+    return [[[QTMovie alloc] initWithFile: path error: NULL] autorelease];
 }
 
@@ -81 +86 @@
 {
     [alias release];
-    [movie release];
+
+    NSLog(@"PSMovieAlert dealloc: %@", self);
     [super dealloc];
 }
@@ -87 +93 @@
 - (NSString *)description;
 {
-    return [NSString stringWithFormat: @"PSMovieAlert (%@%@): %@, repeats %hu times%@", hasAudio ? @"A" : @"", hasVideo ? @"V" : @"", [alias fullPath], repetitions, hasAudio && outputVolume != kNoVolume ? [NSString stringWithFormat: @" at %.0f%% volume", outputVolume * 100] : @""];
+    return [NSString stringWithFormat: @"PSMovieAlert (%@%@): %@, repeats %hu times%@", hasAudio ? @"A" : @"", hasVideo ? @"V" : @"", [alias fullPath], repetitions, hasAudio && outputVolume != PSMediaAlertNoVolume ? [NSString stringWithFormat: @" at %.0f%% volume", outputVolume * 100] : @""];
 }
 
@@ -97 +103 @@
 - (NSAttributedString *)actionDescription;
 {
-    BOOL isStatic = [movie NJR_isStatic];
+    BOOL isStatic = [[self movie] NJR_isStatic];
     NSMutableAttributedString *string = [[(isStatic ? @"Show " : @"Play ") small] mutableCopy];
     NSString *kindString = nil, *name = [alias displayNameWithKindString: &kindString];