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

Timestamp:

06/15/09 06:16:52 (15 years ago)

Author:

Nicholas Riley

Message:

Minimally convert media playback to QTKit. Some direct QuickTime access still needs migrating.

File:

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

trunk/Cocoa/Pester/Source/PSMovieAlertController.m

@@ -10 +10 @@
 #import "PSMovieAlertController.h"
 #import "PSMovieAlert.h"
-#import "NSMovie-NJRExtensions.h"
+#import "QTMovie-NJRExtensions.h"
 #import "NJRSoundManager.h"
 #import <QuickTime/Movies.h>
@@ -38 +38 @@
         repetitionsRemaining--;
         [movieView gotoBeginning: self];
-        [movieView start: self];
+        [movieView play: self];
     }
     delay = (GetMovieDuration((Movie)theMovie) - GetMovieTime((Movie)theMovie, NULL)) / (double)GetMovieTimeScale((Movie)theMovie);
@@ -48 +48 @@
 {
     if ([self initWithWindowNibName: @"Movie alert"]) {
-        NSMovie *movie = [anAlert movie];
+        QTMovie *movie = [anAlert movie];
         NSWindow *window = [self window]; // connect outlets
         alarm = anAlarm;
         alert = anAlert;
+        theMovie = [movie quickTimeMovie];
         [movieView setMovie: movie];
-        theMovie = [movie QTMovie];
         if ([alert hasVideo]) {
             NSRect screenRect = [[window screen] visibleFrame];
-            float magnification = 1.0;
-            NSSize movieSize;
+            NSSize movieSize = [[movie attributeForKey: QTMovieNaturalSizeAttribute] sizeValue];
             NSSize minSize = [window minSize];
             float windowFrameHeight = [window frame].size.height - [[window contentView] frame].size.height;
@@ -63 +62 @@
             screenRect.size.height -= windowFrameHeight;
             minSize.height -= windowFrameHeight;
-            while (1) {
-                movieSize = [movieView sizeForMagnification: magnification];
-                movieSize.height -= 16; // controller is hidden, but its size is included (documented, ergh)
-                if (movieSize.width > screenRect.size.width || movieSize.height > screenRect.size.height)
-                    magnification /= 2;
-                else
-                    break;
+            while (movieSize.width > screenRect.size.width || movieSize.height > screenRect.size.height) {
+                movieSize.width /= 2;
+                movieSize.height /= 2;
             }
             if (movieSize.width < minSize.width) movieSize.width = minSize.width;
@@ -94 +89 @@
         repetitions = [alert repetitions];
         repetitionsRemaining = repetitions;
-        if ([movie hasAudio] && [NJRSoundManager volumeIsNotMutedOrInvalid: [alert outputVolume]] && [NJRSoundManager saveDefaultOutputVolume]) {
+        if ([movie NJR_hasAudio] && [NJRSoundManager volumeIsNotMutedOrInvalid: [alert outputVolume]] && [NJRSoundManager saveDefaultOutputVolume]) {
             [NJRSoundManager setDefaultOutputVolume: [alert outputVolume]];
         }
-        if (![movie isStatic]) [self play]; // if it's an image, don't close the window automatically
+        if (![movie NJR_isStatic]) [self play]; // if it's an image, don't close the window automatically
     }
     return self;
@@ -115 +110 @@
 {
     repetitions = 0;
-    [movieView stop: self];
+    [movieView pause: self];
     [alert completedForAlarm: alarm];
     [self autorelease];