MacGui: Re-Add Preference to enable 64 bit mp4 files option in the main window.

- This is a reversion to a feature added in 620 that was then taken back out in 621. Due to the breaking of so many target devices, we should error on the side of caution here.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@641 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 1efc3b902746a2ce646010aee499570fed7450ab..3a6e574085578c3546a30154bc71383cd1f1f95a 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -880,7 +880,7 @@ return registrationDictionary;
                /* We set the largeFileSize (64 bit formatting) variable here to allow for > 4gb files based on the format being
                mpeg4 and the checkbox being checked 
                *Note: this will break compatibility with some target devices like iPod, etc.!!!!*/
-               if ([fDstMpgLargeFileCheck state] == NSOnState)
+               if ([[NSUserDefaults standardUserDefaults] boolForKey:@"AllowLargeFiles"] > 0 && [fDstMpgLargeFileCheck state] == NSOnState)
                {
                        job->largeFileSize = 1;
                }
@@ -1338,8 +1338,16 @@ return registrationDictionary;
                 _( @"AVC/H.264 Video / AAC Audio" )];
                        /* We enable the create chapters checkbox here since we are .mp4*/
                        [fCreateChapterMarkers setEnabled: YES];
-                       /* We show the Large File (64 bit formatting) checkbox since we are .mp4 */
+                       /* We show the Large File (64 bit formatting) checkbox since we are .mp4 
+                       if we have enabled the option in the global preferences*/
+                       if ([[NSUserDefaults standardUserDefaults] boolForKey:@"AllowLargeFiles"] > 0)
+                       {
                        [fDstMpgLargeFileCheck setHidden: NO];
+                       }
+                       else
+                       {
+                       [fDstMpgLargeFileCheck setState: NSOffState];
+                       }
                        break;
         case 1: 
             ext = "avi";

diff --git a/macosx/English.lproj/Preferences.nib/info.nib b/macosx/English.lproj/Preferences.nib/info.nib
index 59db7cce57b4e6f239ac5f6c41229931657a0bfb..a13174b48d8266e9329657eb21c01107c98b92b9 100644 (file)
--- a/macosx/English.lproj/Preferences.nib/info.nib
+++ b/macosx/English.lproj/Preferences.nib/info.nib
@@ -11,6 +11,6 @@
                <integer>5</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>8P2137</string>
+       <string>8R2218</string>
 </dict>
 </plist>

diff --git a/macosx/English.lproj/Preferences.nib/keyedobjects.nib b/macosx/English.lproj/Preferences.nib/keyedobjects.nib
index 2fcf1ea328120c349f0422cca0047353593a6a44..fb909c5d49ffac071bf443ba24d210eb65c5d787 100644 (file)
Binary files a/macosx/English.lproj/Preferences.nib/keyedobjects.nib and b/macosx/English.lproj/Preferences.nib/keyedobjects.nib differ