summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macosx/Controller.mm5
-rw-r--r--macosx/English.lproj/Preferences.nib/info.nib2
-rw-r--r--macosx/English.lproj/Preferences.nib/keyedobjects.nibbin18304 -> 19100 bytes
-rw-r--r--macosx/HBPreferencesController.m1
4 files changed, 6 insertions, 2 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 0addaf375..8046dabe6 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -847,7 +847,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;
}
@@ -1296,7 +1296,10 @@ return registrationDictionary;
/* 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 */
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"AllowLargeFiles"] > 0)
+ {
[fDstMpgLargeFileCheck setHidden: NO];
+ }
break;
case 1:
ext = "avi";
diff --git a/macosx/English.lproj/Preferences.nib/info.nib b/macosx/English.lproj/Preferences.nib/info.nib
index 9186f2909..5555c9b51 100644
--- a/macosx/English.lproj/Preferences.nib/info.nib
+++ b/macosx/English.lproj/Preferences.nib/info.nib
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>6 1 356 240 0 0 1280 778 </string>
+ <string>90 269 674 609 0 0 1440 878 </string>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
diff --git a/macosx/English.lproj/Preferences.nib/keyedobjects.nib b/macosx/English.lproj/Preferences.nib/keyedobjects.nib
index 191c73192..a8c5f9629 100644
--- a/macosx/English.lproj/Preferences.nib/keyedobjects.nib
+++ b/macosx/English.lproj/Preferences.nib/keyedobjects.nib
Binary files differ
diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index 53d2538e6..2bb38bfc0 100644
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -40,6 +40,7 @@
@"NO", @"DefaultAutoNaming",
@"NO", @"DefaultChapterMarkers",
@"NO", @"ShowVerboseOutput",
+ @"NO", @"AllowLargeFiles",
nil]];
}