Changeset 569

Timestamp:

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

Author:

Nicholas Riley

Message:

Remove last bits of QuickTime usage.

Location:

trunk/Cocoa/Pester

Files:

• Documentation/Read Me.rtfd/TXT.rtf (modified) ( previous)
• Pester to do.oo3/contents.xml (modified) ( previous)
• Source/PSMovieAlertController.h (modified) (1 diff)
• Source/PSMovieAlertController.m (modified) (4 diffs)
• Source/Pester.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Cocoa/Pester/Source/PSMovieAlertController.h

@@ -17 +17 @@
     PSMovieAlert *alert;
     IBOutlet QTMovieView *movieView;
-    void *theMovie; /* Movie */
     unsigned short repetitions;
     unsigned short repetitionsRemaining;

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]];

trunk/Cocoa/Pester/Source/Pester.xcodeproj/project.pbxproj

@@ -105 +105 @@
                 E1B11F7F0CF5F30F004975AA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
                 E1B11F800CF5F30F004975AA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5F240D0036A87E301FE7503 /* Carbon.framework */; };
-                E1B11F820CF5F30F004975AA /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F59E4BEA036B33EC016B311C /* QuickTime.framework */; };
                 E1B11F830CF5F30F004975AA /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E14DB31203B8038300000028 /* IOKit.framework */; };
                 E1B11F840CF5F30F004975AA /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E18DAAEE0442D02500050002 /* CoreAudio.framework */; };
@@ -302 +301 @@
                 F59E4BE6036B2E5E016B311C /* PSScriptAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSScriptAlert.m; sourceTree = "<group>"; };
                 F59E4BE7036B2E5E016B311C /* PSScriptAlert.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PSScriptAlert.h; sourceTree = "<group>"; };
-                F59E4BEA036B33EC016B311C /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
                 F59E4C0D036B43D2016B311C /* QTMovie-NJRExtensions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = "QTMovie-NJRExtensions.m"; sourceTree = "<group>"; };
                 F59E4C0E036B43D2016B311C /* QTMovie-NJRExtensions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "QTMovie-NJRExtensions.h"; sourceTree = "<group>"; };
@@ -353 +351 @@
                                 E1B11F7F0CF5F30F004975AA /* Cocoa.framework in Frameworks */,
                                 E1B11F800CF5F30F004975AA /* Carbon.framework in Frameworks */,
-                                E1B11F820CF5F30F004975AA /* QuickTime.framework in Frameworks */,
                                 E1B11F830CF5F30F004975AA /* IOKit.framework in Frameworks */,
                                 E1B11F840CF5F30F004975AA /* CoreAudio.framework in Frameworks */,
@@ -387 +384 @@
                                 E18DAAEE0442D02500050002 /* CoreAudio.framework */,
                                 E1B121B30CF639A1004975AA /* QTKit.framework */,
-                                F59E4BEA036B33EC016B311C /* QuickTime.framework */,
                                 E14DB31203B8038300000028 /* IOKit.framework */,
                         );