Changeset 1040

Timestamp:

04/10/09 14:46:14 (17 months ago)

Author:

gbooker

Message:

Added a warning about what multi-channel output really means. There is a fair amount of misinformation out there stating that it does AC3 passthrough, and I'm tired of correcting people.

Location:

trunk

Files:

• CPFPerianPrefPaneController.h (modified) (2 diffs)
• CPFPerianPrefPaneController.m (modified) (4 diffs)
• Resources/PerianPrefPane.nib/classes.nib (modified) (4 diffs)
• Resources/PerianPrefPane.nib/info.nib (modified) (2 diffs)
• Resources/PerianPrefPane.nib/keyedobjects.nib (modified) (previous)

trunk/CPFPerianPrefPaneController.h

@@ -90 +90 @@
         IBOutlet NSButton                                       *button_loadExternalSubtitles;
         
+        IBOutlet NSWindow                                       *window_multiChannelSheet;
+        IBOutlet NSTextField                            *textField_multiChannelText;
+        IBOutlet NSButton                                       *button_multiChannelNeverShow;
+        
         //About
         IBOutlet NSTextView                                     *textView_about;
@@ -127 +131 @@
 - (IBAction)saveDynRangeSheet:(id)sender;
 
+- (IBAction)dismissMultiChannelSheet:(id)sender;
+
 //Component List
 - (NSString *)checkComponentStatusByBundleIdentifier:(NSString *)bundleID;

trunk/CPFPerianPrefPaneController.m

@@ -27 +27 @@
 #define AC3TwoChannelModeKey CFSTR("twoChannelMode")
 #define ExternalSubtitlesKey CFSTR("LoadExternalSubtitles")
+#define DontShowMultiChannelWarning CFSTR("DontShowMultiChannelWarning")
 
 //Old
@@ -882 +883 @@
 }
 
+- (void)displayMultiChannelWarning
+{
+        NSString *multiChannelWarning = NSLocalizedString(@"<p style=\"font: 13pt Lucida Grande;\">Multi-Channel Output is not Dolby Digital Passthrough!  It is designed for those with multiple dicrete speakers connected to their mac.  If you selected this expecting passthrough, you are following the wrong instructions.  Follow <a href=\"http://www.cod3r.com/2008/02/the-correct-way-to-enable-ac3-passthrough-with-quicktime/\">these</a> instead.</p>", @"");
+        NSAttributedString *multiChannelWarningAttr = [[NSAttributedString alloc] initWithHTML:[multiChannelWarning dataUsingEncoding:NSUTF8StringEncoding] documentAttributes:nil];
+        [textField_multiChannelText setAttributedStringValue:multiChannelWarningAttr];
+        [multiChannelWarningAttr release];
+        [NSApp beginSheet:window_multiChannelSheet modalForWindow:[[self mainView] window] modalDelegate:nil didEndSelector:nil contextInfo:NULL];
+}
+
 - (IBAction)set2ChannelModePopup:(id)sender;
 {
@@ -898 +908 @@
                 case 3:
                         [self setKey:AC3TwoChannelModeKey forAppID:a52AppID fromInt:0];
+                        if(![self getBoolFromKey:DontShowMultiChannelWarning forAppID:perianAppID withDefault:NO])
+                                [self displayMultiChannelWarning];
                         break;
                 default:
@@ -956 +968 @@
 }
 
+- (IBAction)dismissMultiChannelSheet:(id)sender
+{
+        [NSApp endSheet:window_multiChannelSheet];
+        [self setKey:DontShowMultiChannelWarning forAppID:perianAppID fromBool:[button_multiChannelNeverShow state]];
+        [window_multiChannelSheet orderOut:self];
+        CFPreferencesAppSynchronize(perianAppID);
+}
+
 #pragma mark Subtitles
 - (IBAction)setLoadExternalSubtitles:(id)sender

trunk/Resources/PerianPrefPane.nib/classes.nib

@@ -23 +23 @@
                         <dict>
                                 <key>cancelDynRangeSheet</key>
+                                <string>id</string>
+                                <key>dismissMultiChannelSheet</key>
                                 <string>id</string>
                                 <key>installUninstall</key>
@@ -65 +67 @@
                                 <key>button_loadExternalSubtitles</key>
                                 <string>NSButton</string>
+                                <key>button_multiChannelNeverShow</key>
+                                <string>NSButton</string>
                                 <key>button_updateCheck</key>
                                 <string>NSButton</string>
@@ -85 +89 @@
                                 <key>textField_installStatus</key>
                                 <string>NSTextField</string>
+                                <key>textField_multiChannelText</key>
+                                <string>NSTextField</string>
                                 <key>textField_updateStatus</key>
                                 <string>NSTextField</string>
@@ -90 +96 @@
                                 <string>NSTextView</string>
                                 <key>window_dynRangeSheet</key>
+                                <string>NSWindow</string>
+                                <key>window_multiChannelSheet</key>
                                 <string>NSWindow</string>
                         </dict>

trunk/Resources/PerianPrefPane.nib/info.nib

@@ -6 +6 @@
         <string>677</string>
         <key>IBLastKnownRelativeProjectPath</key>
-        <string>Perian.xcodeproj</string>
+        <string>../Perian.xcodeproj</string>
         <key>IBOldestOS</key>
         <integer>5</integer>
@@ -12 +12 @@
         <array>
                 <integer>32</integer>
+                <integer>245</integer>
         </array>
         <key>IBSystem Version</key>
-        <string>9F33</string>
+        <string>9G55</string>
         <key>targetFramework</key>
         <string>IBCocoaFramework</string>