Changeset 569 for trunk/Cocoa/Pester/Source/PSMovieAlertController.m

Timestamp:

07/20/09 06:03:15 (15 years ago)

Author:

Nicholas Riley

Message:

Remove last bits of QuickTime usage.

File:

• trunk/Cocoa/Pester/Source/PSMovieAlertController.m (modified) (4 diffs)

trunk/Cocoa/Pester/Source/PSMovieAlertController.m

@@ -12 +12 @@
 #import "QTMovie-NJRExtensions.h"
 #import "NJRSoundManager.h"
-#import <QuickTime/Movies.h>
 
 @implementation PSMovieAlertController
@@ -28 +27 @@
 }
 
+- (void)_movieRateDidChange:(NSNotification *)notification;
+{
+    float newRate = [[[notification userInfo] objectForKey: QTMovieRateDidChangeNotificationParameter]
+                     floatValue];
+    if (newRate != 0)
+        return;
+    
+    if (repetitions == 0 || repetitionsRemaining == 0) {
+        [[NSNotificationCenter defaultCenter] removeObserver: self
+                                                        name: QTMovieRateDidChangeNotification
+                                                      object: [movieView movie]];
+    
+        [self close];
+        return;
+    }
+    repetitionsRemaining--;
+    [movieView gotoBeginning: self];
+    [movieView play: self];
+}
+
 - (void)play;
 {
-    NSTimeInterval delay;
-    if (repetitions == 0) return;
-    if (IsMovieDone((Movie)theMovie) || repetitionsRemaining == repetitions) {
-        if (repetitionsRemaining == 0) {
-            [self close];
-            return;
-        }
-        repetitionsRemaining--;
-        [movieView gotoBeginning: self];
-        [movieView play: self];
-    }
-    delay = (GetMovieDuration((Movie)theMovie) - GetMovieTime((Movie)theMovie, NULL)) / (double)GetMovieTimeScale((Movie)theMovie);
-    // XXX should use a timebase callback for this instead (see NJRQTMediaPopUpButton); also, use QuickTimeÕs built-in loop functionality instead of rolling our own?
-    [self performSelector: @selector(play) withObject: nil afterDelay: delay inModes: [NSArray arrayWithObject: NSDefaultRunLoopMode]];
+    repetitionsRemaining = repetitions - 1;
+
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(_movieRateDidChange:)
+                                                 name: QTMovieRateDidChangeNotification
+                                               object: [movieView movie]];
+    [movieView play: self];
 }
 
@@ -53 +65 @@
         alarm = anAlarm;
         alert = anAlert;
-        theMovie = [movie quickTimeMovie];
         [movieView setMovie: movie];
         if ([alert hasVideo]) {
@@ -89 +100 @@
         [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(close) name: PSAlarmAlertStopNotification object: nil];
         repetitions = [alert repetitions];
-        repetitionsRemaining = repetitions;
         if ([movie NJR_hasAudio] && [NJRSoundManager volumeIsNotMutedOrInvalid: [alert outputVolume]] && [NJRSoundManager saveDefaultOutputVolume]) {
             [NJRSoundManager setDefaultOutputVolume: [alert outputVolume]];