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

Timestamp:

01/02/03 05:30:03 (21 years ago)

Author:

Nicholas Riley

Message:

Updated for Pester 1.1a5 (very limited release).

Pester 1.1a4 was never released.

Location:

trunk/Cocoa/Pester/Source

Files:

• . (modified) (1 prop)
• NJRQTMediaPopUpButton.m (modified) (7 diffs)

trunk/Cocoa/Pester/Source

@@ -1 +1 @@
 build
+.gdb_history

@@ -1 +1 @@
 build
+.gdb_history

trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.m

@@ -11 +11 @@
 #import "NSMovie-NJRExtensions.h"
 #import "NSImage-NJRExtensions.h"
+
+// XXX workaround for SoundFileManager log message in 10.2.3 and earlier
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+// XXX end workaround
 
 static const int NJRQTMediaPopUpButtonMaxRecentItems = 10;
@@ -103 +109 @@
 #pragma mark initialize-release
 
-- (void)awakeFromNib;
+- (void)_setUp;
 {
     NSMenu *menu;
@@ -145 +151 @@
 }
 
+- (id)initWithFrame:(NSRect)frame;
+{
+    if ( (self = [super initWithFrame: frame]) != nil) {
+        [self _setUp];
+    }
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)coder;
+{
+    if ( (self = [super initWithCoder: coder]) != nil) {
+        [self _setUp];
+    }
+    return self;
+}
+
 - (void)dealloc;
 {
@@ -171 +193 @@
 }
 
+- (void)setAlias:(BDAlias *)alias;
+{
+    [self _setAlias: alias];
+    if ([self _validateWithPreview: NO]) {
+        [self selectItem: [self _itemForAlias: selectedAlias]];
+    }
+}
+
 - (void)_setPath:(NSString *)path;
 {
@@ -186 +216 @@
     // [self _validateRecentMedia];
     path = [alias fullPath];
-    sf = [[SoundFileManager sharedSoundFileManager] soundFileFromPath: path];
+    {   // XXX suppress log message from Apple's code:
+        // 2002-12-14 14:09:58.740 Pester[26529] Could not find sound type for directory /Users/nicholas/Desktop
+        int errfd = dup(STDERR_FILENO), nullfd = open("/dev/null", O_WRONLY, 0);
+        // need to have something open in STDERR_FILENO because if it isn't,
+        // NSLog will log to /dev/console
+        dup2(nullfd, STDERR_FILENO);
+        close(nullfd);
+        sf = [[SoundFileManager sharedSoundFileManager] soundFileFromPath: path];
+        dup2(errfd, STDERR_FILENO);
+        close(errfd);
+    }
     // NSLog(@"_itemForAlias: %@", path);
 
@@ -250 +290 @@
             [preview setMovie: nil];
             if (movie == nil) {
-                NSBeginAlertSheet(@"Format not recognized", @"OK", nil, nil, [self window], nil, nil, nil, nil, @"The item you selected isnÕt a sound or movie recognized by QuickTime.  Please select a different item.");
+                NSBeginAlertSheet(@"Format not recognized", nil, nil, nil, [self window], nil, nil, nil, nil, @"The item you selected isnÕt a sound or movie recognized by QuickTime.  Please select a different item.");
                 [self _invalidateSelection];
                 return NO;
             }
             if (![movie hasAudio] && ![movie hasVideo]) {
-                NSBeginAlertSheet(@"No video or audio", @"OK", nil, nil, [self window], nil, nil, nil, nil, @"Ò%@Ó contains neither audio nor video content playable by QuickTime.  Please select a different item.", [[NSFileManager defaultManager] displayNameAtPath: [selectedAlias fullPath]]);
+                NSBeginAlertSheet(@"No video or audio", nil, nil, nil, [self window], nil, nil, nil, nil, @"Ò%@Ó contains neither audio nor video content playable by QuickTime.  Please select a different item.", [[NSFileManager defaultManager] displayNameAtPath: [selectedAlias fullPath]]);
                 [self _invalidateSelection];
                 [movie release];
@@ -262 +302 @@
         }
         [movie release];
-        [preview start: self];
+        if (doPreview) [preview start: self];
     }
     [[NSNotificationCenter defaultCenter] postNotificationName: NJRQTMediaPopUpButtonMovieChangedNotification object: self];

@@ -1 +1 @@
 build
+.gdb_history