Changeset 60 for trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.m

Timestamp:

01/05/03 23:02:48 (21 years ago)

Author:

Nicholas Riley

Message:

PSScriptAlert.m: Removed reference to NDAppleScriptObject.

PSMovieAlertController.[hm]: Added minimum sizing.

NJRCenteringMovieView.[hm]: Support for centering movie inside its
frame if the frame is too large for the movie; sizes movie
proportionally if necessary (not used in Pester).

NSImage-NJRExtensions.[hm]: Fixed copyright.

Read Me.rtfd: Updated with bug fixes.

PSMovieAlert.m: Note bug in NSMovieView, currently doesn't affect us.

NJRQTMediaPopUpButton.m: Work around background processor use bug when
NSMovieView has movie set but not playing.

NJRVoicePopUpButton.m: Removed obsolete comment.

PSApplication.m: Only show alarm set window on rapp if alerts aren't
expiring.

PSAlarms.[hm]: Added -alarmsExpiring for support of conditional
rapp window open feature in PSApplication.

PSAlarmSetController.m: Stop window update timer and movie playback on
hide, restart timer on activate - fixes background processor usage.

File:

• trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.m (modified) (5 diffs)

trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.m

@@ -11 +11 @@
 #import "NSMovie-NJRExtensions.h"
 #import "NSImage-NJRExtensions.h"
+#import <QuickTime/Movies.h>
 
 // XXX workaround for SoundFileManager log message in 10.2.3 and earlier
@@ -275 +276 @@
 }
 
+void
+MovieStoppedCB(QTCallBack cb, long refCon)
+{
+    NSMovieView *preview = (NSMovieView *)refCon;
+    // if we donÕt do this after the runloop has finished, then we crash in MCIdle because itÕs expecting a movie and doesnÕt have one any more
+    [preview performSelector: @selector(setMovie:) withObject: nil afterDelay: 0]; // otherwise we get an extra runloop timer which uses a lot of CPU from +[NSMovieView _idleMovies]
+    DisposeCallBack(cb);
+}
+
 - (BOOL)_validateWithPreview:(BOOL)doPreview;
 {
@@ -285 +295 @@
         NSMovie *movie = [[NSMovie alloc] initWithURL: [NSURL fileURLWithPath: [selectedAlias fullPath]] byReference: YES];
         movieCanRepeat = ![movie isStatic];
-        if ([movie hasAudio])
-            [preview setMovie: movie];
-        else {
+        if ([movie hasAudio]) {
+            [preview setMovie: doPreview ? movie : nil];
+        } else {
             [preview setMovie: nil];
             if (movie == nil) {
@@ -301 +311 @@
             }
         }
+        if (doPreview) {
+            Movie qtMovie = [movie QTMovie];
+            QTCallBack cbStop = NewCallBack(GetMovieTimeBase(qtMovie), callBackAtExtremes);
+            QTCallBackUPP cbStopUPP = NewQTCallBackUPP(MovieStoppedCB);
+            OSErr err = CallMeWhen(cbStop, cbStopUPP, (long)preview, triggerAtStop, 0, 0);
+            if (err != noErr) {
+                NSLog(@"CanÕt register QuickTime stop timebase callback for preview: %ld", err);
+                DisposeCallBack(cbStop);
+            }
+            [preview start: self];
+        }
         [movie release];
-        if (doPreview) [preview start: self];
     }
     [[NSNotificationCenter defaultCenter] postNotificationName: NJRQTMediaPopUpButtonMovieChangedNotification object: self];
@@ -313 +333 @@
 {
     [preview stop: self];
+    [preview setMovie: nil]; // otherwise we get an extra runloop timer which uses a lot of CPU from +[NSMovieView _idleMovies]
 }