Changeset 133 for trunk/Cocoa/Pester/Source/PSAlarmSetController.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/PSAlarmSetController.m (modified) (7 diffs)

trunk/Cocoa/Pester/Source/PSAlarmSetController.m

@@ -12 +12 @@
 #import "PSPowerManager.h"
 #import "PSTimeDateEditor.h"
+#import "PSVolumeController.h"
 #import "NJRDateFormatter.h"
 #import "NJRFSObjectSelector.h"
 #import "NJRIntervalField.h"
 #import "NJRQTMediaPopUpButton.h"
+#import "NJRSoundManager.h"
 #import "NJRVoicePopUpButton.h"
 #import "NSString-NJRExtensions.h"
@@ -61 +63 @@
 - (void)_readAlerts:(PSAlerts *)alerts;
 - (BOOL)_setAlerts;
+- (void)_setVolume:(float)volume withPreview:(BOOL)preview;
 - (void)_stopUpdateTimer;
 
@@ -74 +77 @@
     [[self window] center];
     [PSTimeDateEditor setUpTimeField: timeOfDay dateField: timeDate completions: timeDateCompletions];
+    { // volume defaults, usually overridden by restored alert info
+        float volume = 0.5;
+        [NJRSoundManager getDefaultOutputVolume: &volume];
+        [self _setVolume: volume withPreview: NO];
+    }
     [editAlert setIntValue: [defaults boolForKey: PSAlertsEditing]];
     {
@@ -231 +239 @@
 {
     return timeCalendarButton;
+}
+
+#pragma mark volume
+
+- (IBAction)showVolume:(NSButton *)sender;
+{
+    [PSVolumeController controllerWithVolume: [sound outputVolume] delegate: self];
+}
+
+#define VOLUME_IMAGE_INDEX(vol) (vol * 4) - 0.01
+
+- (void)_setVolume:(float)volume withPreview:(BOOL)preview;
+{
+    float outputVolume = [sound outputVolume];
+    short volumeImageIndex = VOLUME_IMAGE_INDEX(volume);
+
+    if (outputVolume > 0 && volumeImageIndex == VOLUME_IMAGE_INDEX(outputVolume)) return;
+    NSString *volumeImageName = [NSString stringWithFormat: @"Volume %ld", volumeImageIndex];
+    [soundVolumeButton setImage: [NSImage imageNamed: volumeImageName]];
+
+    [sound setOutputVolume: volume withPreview: preview];
+}
+
+- (void)volumeController:(PSVolumeController *)controller didSetVolume:(float)volume;
+{
+    [self _setVolume: volume withPreview: YES];
+}
+
+- (NSView *)volumeControllerLaunchingView:(PSVolumeController *)controller;
+{
+    return soundVolumeButton;
 }
 
@@ -299 +338 @@
     [sound setEnabled: playSoundSelected];
     [soundRepetitions setEnabled: canRepeat];
+    [soundVolumeButton setEnabled: canRepeat && [sound hasAudio]];
     [soundRepetitionStepper setEnabled: canRepeat];
     [soundRepetitionsLabel setTextColor: canRepeat ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
@@ -366 +406 @@
         } else if ([alert isKindOfClass: [PSNotifierAlert class]]) {
             [displayMessage setIntValue: YES];
-        } else if ([alert isKindOfClass: [PSBeepAlert class]]) {
-            unsigned int repetitions = [(PSBeepAlert *)alert repetitions];
+        } else if ([alert isKindOfClass: [PSMediaAlert class]]) {
+            unsigned int repetitions = [(PSMediaAlert *)alert repetitions];
             [playSound setIntValue: YES];
-            [sound setAlias: nil];
             [soundRepetitions setIntValue: repetitions];
             [soundRepetitionStepper setIntValue: repetitions];
-        } else if ([alert isKindOfClass: [PSMovieAlert class]]) {
-            unsigned int repetitions = [(PSMovieAlert *)alert repetitions];
-            [playSound setIntValue: YES];
-            [sound setAlias: [(PSMovieAlert *)alert movieFileAlias]];
-            [soundRepetitions setIntValue: repetitions];
-            [soundRepetitionStepper setIntValue: repetitions];
+            [self _setVolume: [(PSMediaAlert *)alert outputVolume] withPreview: NO];
+            if ([alert isKindOfClass: [PSBeepAlert class]]) {
+                [sound setAlias: nil];
+            } else if ([alert isKindOfClass: [PSMovieAlert class]]) {
+                [sound setAlias: [(PSMovieAlert *)alert movieFileAlias]];
+            }
         } else if ([alert isKindOfClass: [PSSpeechAlert class]]) {
             [doSpeak setIntValue: YES];
@@ -412 +451 @@
             BDAlias *soundAlias = [sound selectedAlias];
             unsigned short numReps = [soundRepetitions intValue];
+            PSMediaAlert *alert;
             if (soundAlias == nil) // beep alert
-                [alerts addAlert: [PSBeepAlert alertWithRepetitions: numReps]];
+                alert = [PSBeepAlert alertWithRepetitions: numReps];
             else // movie alert
-                [alerts addAlert: [PSMovieAlert alertWithMovieFileAlias: soundAlias repetitions: numReps]];
+                alert = [PSMovieAlert alertWithMovieFileAlias: soundAlias repetitions: numReps];
+            [alerts addAlert: alert];
+            [alert setOutputVolume: [sound outputVolume]];
         }
         // speech alert