Changeset 5490

Timestamp:

05/02/08 14:58:58 (2 weeks ago)

Author:

morris

Message:

Tip user about the Flip4Mac component if opening WMV file

Files:

• Spiral/trunk/SPApplicationController.h (modified) (1 diff)
• Spiral/trunk/SPApplicationController.m (modified) (9 diffs)

Spiral/trunk/SPApplicationController.h

@@ -59 +59 @@
-- (BOOL)openFile:(NSString *)path withPlaylistFile:(SPPlaylistFile *)file;
-- (BOOL)openURL:(WIURL *)url withPlaylistFile:(SPPlaylistFile *)file;
-- (BOOL)hasPerianInstalled;
-- (void)scheduleUpdateCheck;
-

Spiral/trunk/SPApplicationController.m

@@ -39 +39 @@
-#import "SPWiiRemote.h"
-
+#define SPFilenameErrorKey                              @"SPFilenameErrorKey"
+#define SPRecoveryURLErrorKey                   @"SPRecoveryURLErrorKey"
+
+
-static SPApplicationController                  *SPSharedApplicationController;
-
@@ -46 +50 @@
-- (SPRemoteContext)_remoteContext;
-- (void)_handleRemoteAction:(SPRemoteAction)action;
+
+- (BOOL)_hasQuicktimeComponentWithName:(NSString *)name;
+- (BOOL)_hasPerianInstalled;
+- (BOOL)_hasFlip4MacWMVImportInstalled;
-
-@end
@@ -199 +207 @@
-}
-
+
+
+#pragma mark -
+
+- (BOOL)_hasQuicktimeComponentWithName:(NSString *)name {
+        NSString                *libraryPath, *componentPath;
+        
+        for(libraryPath in NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSAllDomainsMask, YES)) {
+                componentPath = [libraryPath stringByAppendingPathComponent:[NSSWF:@"Quicktime/%@.component", name]];
+                
+                if([[NSFileManager defaultManager] fileExistsAtPath:componentPath])
+                        return YES;
+        }
+        
+        return NO;
+}
+
+
+
+- (BOOL)_hasPerianInstalled {
+        return [self _hasQuicktimeComponentWithName:@"Perian"];
+}
+
+
+
+- (BOOL)_hasFlip4MacWMVImportInstalled {
+        return [self _hasQuicktimeComponentWithName:@"Flip4Mac WMV Import"];
+}
+
-@end
-
@@ -251 +288 @@
-- (NSError *)application:(NSApplication *)application willPresentError:(NSError *)error {
-        NSMutableDictionary             *userInfo;
-
+filename, *
-        
-        if([error domain] == NSOSStatusErrorDomain && [error code] == -2048) {
@@ -263 +300 @@
-                        recoverySuggestion = NSLS(@"The file is not a movie file.", @"Error description");
-                
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        recoverySuggestion = [recoverySuggestion stringByAppendingFormat:@"\n\n%@",
-                                NSLS(@"Try installing Perian, a free QuickTime component that adds native support for many popular video formats.",
@@ -274 +326 @@
-                                                 forKey:NSLocalizedRecoveryOptionsErrorKey];
-                        [userInfo setObject:self forKey:NSRecoveryAttempterErrorKey];
+                        [userInfo setObject:[WIURL URLWithString:@"http://www.perian.org/"] forKey:SPRecoveryURLErrorKey];
-                }
-                
@@ -283 +336 @@
-        
-        return error;
+}
+
+
+
+- (BOOL)attemptRecoveryFromError:(NSError *)error optionIndex:(NSUInteger)optionIndex {
+        if(optionIndex == 1)
+                [[NSWorkspace sharedWorkspace] openURL:[[[error userInfo] objectForKey:SPRecoveryURLErrorKey] URL]];
+        
+        return NO;
-}
-
@@ -560 +622 @@
-        if(!movie) {
-                if(error) {
-
+
+
+
+
-                                [[NSDocumentController sharedDocumentController] presentError:error];
+                        }
-                }
-                
@@ -582 +648 @@
-        
-        return YES;
-}
-
-
-
-- (BOOL)hasPerianInstalled {
-        NSString                *libraryPath, *perianPath;
-        BOOL                    hasPerian = NO;
-        
-        for(libraryPath in NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSAllDomainsMask, YES)) {
-                perianPath = [libraryPath stringByAppendingPathComponent:@"QuickTime/Perian.component"];
-                
-                if([[NSFileManager defaultManager] fileExistsAtPath:perianPath]) {
-                        hasPerian = YES;
-                        
-                        break;
-                }
-        }
-        
-        return hasPerian;
-}
-