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

Timestamp:

04/09/03 05:44:11 (21 years ago)

Author:

Nicholas Riley

Message:

VERSION: Updated for 1.1b4.

PSMovieAlertController.[hm]: Set output volume from alert; save and
restore output volume (bug 27).

PSBeepAlert.[hm]: Save and set volume, disabled pending a
synchronous equivalent to NSBeep().

NJRQTMediaPopUpButton.[hm]: Save movieHasAudio (does not include
beeps, pending the above fix, since they don't permit volume
adjustment). savedVolume indicates whether the volume has been saved
but not restored yet; outputVolume stores the set volume (eventually
incorporated into a PSMediaAlert).

PSMediaAlert.[hm]: Stores repetitions and volume information for audio
alerts. New superclass of PSBeepAlert and PSMovieAlert.

PSPreferencesController.m: Fixed bug where hot keys still appeared
even after they couldn't be set - last of bug 29. Add Command-comma
to the list of disallowed equivalents, as it's reserved for
Preferences now (still a bug - it'll show the entire set key
equivalent at the left side of the window when you press
command-comma; ah well.)

Volume [0123].png: Volume-indicating small icons from QuickTime 6.

NJRSoundManager.[hm]: Interface to volume saving, restoring, setting -
necessary because the QuickTime call to SetDefaultOutputVolume sets
the right channel volume only (bug 27).

PSVolumeController.h: Controller for volume popup window (bug 27).
Not your average NSWindowController, but it works. Keyboard control
of volume is still necessary; filed as bug 31.

PSAlarmSetController.[hm]: Added references to sound volume button and
showVolume: action. Added volume setting support (bug 27); mostly
similar interface to calendar, though we need direct calls to
NJRSoundManager to restore sound volume at times. Only enable sound
volume button if selected media file has audio component (and isn't the
system alert sound, which I discussed above). Take advantage of
PSMediaAlert to factor some code in _readAlerts:. Save and restore
volume as part of alerts.

Read Me.rtfd: Updated release notes; fixed some bizarre text
formatting problems; search/replace "* " bullet-space with "*\t"
bullet-tab to improve alignment in release notes.

PSMovieAlert.[hm]: Factored code into PSMediaAlert. Describe output
volume as percentage of maximum.

NJRHotKey.m: Fixed some odd spacing left over from Ecky's code.

PSApplication.m: Restore saved output volume on quit.

English.lproj/MainMenu.nib: Added volume button.

English.lproj/Volume.nib: Volume nib (bug 27).

PSCalendarController.m: Removed casts from a copy/paste error. Fixed
variable names in some code inherited from my TextExtras incremental
search modifications - it's not always a text field now.

File:

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

trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.m

@@ -9 +9 @@
 #import "NJRQTMediaPopUpButton.h"
 #import "SoundFileManager.h"
+#import "NJRSoundManager.h"
 #import "NSMovie-NJRExtensions.h"
 #import "NSImage-NJRExtensions.h"
@@ -27 +28 @@
 - (NSMenuItem *)_itemForAlias:(BDAlias *)alias;
 - (BOOL)_validateWithPreview:(BOOL)doPreview;
+- (void)_updateOutputVolume;
+- (void)_startSoundPreview;
 @end
 
@@ -267 +270 @@
 }
 
+- (BOOL)hasAudio;
+{
+    return movieHasAudio;
+}
+
+- (float)outputVolume;
+{
+    return outputVolume;
+}
+
+- (void)setOutputVolume:(float)volume withPreview:(BOOL)doPreview;
+{
+    if (![NJRSoundManager volumeIsNotMutedOrInvalid: volume]) return;
+    outputVolume = volume;
+    if (!doPreview) return;
+    // NSLog(@"setting volume to %f, preview movie %@", volume, [preview movie]);
+    if ([preview movie] == nil) {
+        [self _validateWithPreview: YES];
+    } else { // don't restart preview if already playing
+        [self _updateOutputVolume];
+    }
+}
+
 #pragma mark selected media validation
 
@@ -276 +302 @@
 }
 
+- (void)_updateOutputVolume;
+{
+    if ([preview movie] != nil && outputVolume != kNoVolume) {
+        if (!savedVolume && ![NJRSoundManager saveDefaultOutputVolume])
+            return;
+        savedVolume = YES;
+        [NJRSoundManager setDefaultOutputVolume: outputVolume];
+        if (![preview isPlaying]) [self _startSoundPreview];
+    }
+}
+
+- (void)_resetOutputVolume;
+{
+    [NJRSoundManager restoreSavedDefaultOutputVolumeIfCurrently: outputVolume];
+    savedVolume = NO;
+}
+
+- (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)
 {
-    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]
+    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];
 }
 
@@ -291 +356 @@
         [preview setMovie: nil];
         movieCanRepeat = YES;
-        if (doPreview) NSBeep();
+        movieHasAudio = NO; // XXX should be YES - this is broken, NSBeep() is asynchronous
+        if (doPreview) {
+            // XXX [self _updateOutputVolume];
+            NSBeep();
+            // XXX [self _resetOutputVolume];
+        }
     } else {
         NSMovie *movie = [[NSMovie alloc] initWithURL: [NSURL fileURLWithPath: [selectedAlias fullPath]] byReference: YES];
         movieCanRepeat = ![movie isStatic];
-        if ([movie hasAudio]) {
+        if (movieHasAudio = [movie hasAudio]) {
             [preview setMovie: doPreview ? movie : nil];
+            [self _updateOutputVolume];
         } else {
-            [preview setMovie: nil];
+            [self _resetPreview];
+            doPreview = NO;
             if (movie == nil) {
                 NSBeginAlertSheet(@"Format not recognized", nil, nil, nil, [self window], nil, nil, nil, nil, NSLocalizedString(@"The item you selected isn't a sound or movie recognized by QuickTime.  Please select a different item.", "Message displayed in alert sheet when media document is not recognized by QuickTime"));
@@ -312 +384 @@
         }
         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];
+            [self _startSoundPreview];
         }
         [movie release];
@@ -333 +397 @@
 {
     [preview stop: self];
-    [preview setMovie: nil]; // otherwise we get an extra runloop timer which uses a lot of CPU from +[NSMovieView _idleMovies]
+    [self _resetPreview];
 }