Changeset 533 for trunk/Cocoa

Timestamp:

06/01/09 04:45:33 (16 years ago)

Author:

Nicholas Riley

Message:

Restore sound selector; move most of the preview functionality (excluding validation) to QTKit as NSMovieView and QuickTime are deprecated. Hopefully this will improve stability as well.

Location:

trunk/Cocoa/Pester/Source

Files:

• English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) ( previous)
• NJRQTMediaPopUpButton.h (modified) (2 diffs)
• NJRQTMediaPopUpButton.m (modified) (7 diffs)
• NJRUnfocusableMovieView.h (modified) (1 diff)

trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib

@@ -175 +175 @@
                         <dict>
                                 <key>preview</key>
-                                <string>NSMovieView</string>
+                                <string>QTMovieView</string>
                         </dict>
                         <key>SUPERCLASS</key>
@@ -200 +200 @@
                         <string>ObjC</string>
                         <key>SUPERCLASS</key>
-                        <string>NSMovieView</string>
+                        <string>QTMovieView</string>
                 </dict>
                 <dict>

trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>2</integer>
+                <integer>507</integer>
         </array>
         <key>IBSystem Version</key>

trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.h

@@ -8 +8 @@
 
 #import <AppKit/AppKit.h>
+#import <QTKit/QTKit.h>
 #import "BDAlias.h"
 
@@ -13 +14 @@
 
 @interface NJRQTMediaPopUpButton : NSPopUpButton {
-    IBOutlet NSMovieView *preview;
+    IBOutlet QTMovieView *preview;
     BOOL movieCanRepeat, movieHasAudio;
     NSMenuItem *otherItem;

trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.m

@@ -14 +14 @@
 #import <QTKit/QTKit.h>
 
-#include <QuickTime/Movies.h>
 #include <limits.h>
 
@@ -25 +24 @@
 - (NSMenuItem *)_itemForAlias:(BDAlias *)alias;
 - (BOOL)_validateWithPreview:(BOOL)doPreview;
-- (void)_updateOutputVolume;
 - (void)_startSoundPreview;
+- (void)_resetPreview;
+- (void)_resetOutputVolume;
 @end
 
@@ -304 +304 @@
     if ([preview movie] == nil) {
         [self _validateWithPreview: YES];
-    } else { // don't restart preview if already playing
-        [self _updateOutputVolume];
+    } else {
+        [self _startSoundPreview];
     }
 }
@@ -318 +318 @@
 }
 
-- (void)_updateOutputVolume;
-{
-    if ([preview movie] != nil && outputVolume != kNoVolume) {
-        if (!savedVolume && ![NJRSoundManager saveDefaultOutputVolume])
-            return;
+- (void)_startSoundPreview;
+{
+    if ([preview movie] == nil || outputVolume == kNoVolume)
+        return;
+
+    if (savedVolume || [NJRSoundManager saveDefaultOutputVolume]) {
         savedVolume = YES;
         [NJRSoundManager setDefaultOutputVolume: outputVolume];
-        if (![preview isPlaying]) [self _startSoundPreview];
-    }
+    }
+
+    if ([[preview movie] rate] != 0)
+        return; // don't restart preview if already playing
+    
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(_soundPreviewDidEnd:)
+                                                 name: QTMovieDidEndNotification
+                                               object: [preview movie]];
+    [preview play: self];
+}
+
+- (void)_soundPreviewDidEnd:(NSNotification *)notification;
+{
+    [self _resetPreview];
+}
+
+- (void)_resetPreview;
+{
+    [preview setMovie: nil];
+    [self _resetOutputVolume];
 }
 
@@ -335 +355 @@
 }
 
-- (void)_resetPreview;
-{
-    // 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 setMovie: nil]; // otherwise we get an extra runloop timer which uses a lot of CPU from +[NSMovieView _idleMovies]
-    // need to wait for runloop to stop movie, otherwise we're still playing at the time the volume changes
-    [self performSelector: @selector(_resetOutputVolume) withObject: nil afterDelay: 0];
-}
-
-void
-MovieStoppedCB(QTCallBack cb, long refCon)
-{
-    NJRQTMediaPopUpButton *self = (NJRQTMediaPopUpButton *)refCon;
-    // avoid multiple messages from multiple movie playback cycles in the same runloop
-    [NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(_resetPreview) object: nil];
-    [self performSelector: @selector(_resetPreview) withObject: nil afterDelay: 0];
-    DisposeCallBack(cb);
-}
-
-- (void)_startSoundPreview;
-{
-    Movie qtMovie = [[preview movie] QTMovie];
-    QTCallBack cbStop = NewCallBack(GetMovieTimeBase(qtMovie), callBackAtExtremes);
-    QTCallBackUPP cbStopUPP = NewQTCallBackUPP(MovieStoppedCB);
-    OSErr err = CallMeWhen(cbStop, cbStopUPP, (long)self, triggerAtStop, 0, 0);
-    if (err != noErr) {
-        NSLog(@"Can't register QuickTime stop timebase callback for preview: %ld", err);
-        DisposeCallBack(cbStop);
-    }
-    [preview start: self];
-}
-
 - (BOOL)_validateWithPreview:(BOOL)doPreview;
 {
-    [preview stop: self];
+    [preview pause: self];
     if (selectedAlias == nil) {
         [preview setMovie: nil];
@@ -382 +371 @@
         movieCanRepeat = ![movie isStatic];
         if (movieHasAudio = [movie hasAudio]) {
-            [preview setMovie: doPreview ? movie : nil];
-            [self _updateOutputVolume];
+            [preview setMovie: doPreview ? [QTMovie movieWithURL: [NSURL fileURLWithPath: [selectedAlias fullPath]] error: NULL] : nil]; // XXX handle errors; fix
         } else {
             [self _resetPreview];
@@ -412 +400 @@
 - (IBAction)stopSoundPreview:(id)sender;
 {
-    [preview stop: self];
+    [preview pause: self];
     [self _resetPreview];
 }

trunk/Cocoa/Pester/Source/NJRUnfocusableMovieView.h

@@ -8 +8 @@
 
 #import <AppKit/AppKit.h>
+#import <QTKit/QTKit.h>
 
-
-@interface NJRUnfocusableMovieView : NSMovieView {
+@interface NJRUnfocusableMovieView : QTMovieView {
 
 }