OSDN Git Service

MacGui: Add an "Attempt Scan Anyway" option to the 64-bit physical dvd scan warning.
authordynaflash <dynaflash@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Fri, 1 May 2009 21:40:35 +0000 (21:40 +0000)
committerdynaflash <dynaflash@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Fri, 1 May 2009 21:40:35 +0000 (21:40 +0000)
- Allows reading of un-encrypted physical dvd's.

git-svn-id: svn://localhost/HandBrake/trunk@2365 b64f7644-9d1e-0410-96f1-a4d463321fa5

macosx/Controller.mm

index 6d929a0..0253040 100644 (file)
@@ -1470,8 +1470,21 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
         /*On Screen Notification*/
         int status;
         NSBeep();
-        status = NSRunAlertPanel(@"64-bit HandBrake cannot read encrypted dvds!",@"This scan will be cancelled!", @"OK", nil, nil);
+        status = NSRunAlertPanel(@"64-bit HandBrake cannot read encrypted dvds!",@"", @"Cancel Scan", @"Attempt Scan Anyway", nil);
         [NSApp requestUserAttention:NSCriticalRequest];
+        
+        if (status == NSAlertDefaultReturn)
+        {
+            /* User chose to cancel the scan */
+            [self writeToActivityLog: "cannot open physical dvd , scan cancelled"];
+            cancelScanDecrypt = 1;
+        }
+        else
+        {
+            [self writeToActivityLog: "user overrode 64-bit warning trying to open physical dvd without decryption"];
+            cancelScanDecrypt = 0;
+        }
+
 #else
         /* lets check for vlc here to make sure we have a dylib available to use for decrypting */
         NSString *vlcPath = @"/Applications/VLC.app/Contents/MacOS/lib/libdvdcss.2.dylib";