diff options
| author | dynaflash <[email protected]> | 2007-06-28 15:14:33 +0000 |
|---|---|---|
| committer | dynaflash <[email protected]> | 2007-06-28 15:14:33 +0000 |
| commit | e2df1a37f062a8ce61a791ff137089fe1b1fef23 (patch) | |
| tree | 3c8630c31cd2ea15311454389e121bf1411cbeb0 /macosx | |
| parent | b867f415ef36790ec568e2588f2bed2d9b494ece (diff) | |
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
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/Controller.mm | 12 | ||||
| -rw-r--r-- | macosx/English.lproj/Preferences.nib/info.nib | 2 | ||||
| -rw-r--r-- | macosx/English.lproj/Preferences.nib/keyedobjects.nib | bin | 20063 -> 21093 bytes |
3 files changed, 11 insertions, 3 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 1efc3b902..3a6e57408 100644 --- 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 59db7cce5..a13174b48 100644 --- 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 Binary files differindex 2fcf1ea32..fb909c5d4 100644 --- a/macosx/English.lproj/Preferences.nib/keyedobjects.nib +++ b/macosx/English.lproj/Preferences.nib/keyedobjects.nib |