MacGui: Presets - modify built in presets to work with the new audio formats. Make...

Built In Preset Changes:
- PS3: Change level to 41, audio one track, 160 kbps DPL2 mixdown
- AppleTV: Change Audio to one track, 160 kbps DPL2 mixdown
- iPod: Change Audio to one track, 128 kbps Stereo Mixdown

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

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 20c7b87..67aad48 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1689,7 +1689,7 @@ the user is using "Custom" settings by determining the sender*/
     /* If we have MP4, AVC H.264 and x264 Main then we enable the x264 Options field for the
         Add Preset window we are about to open. We do this before we actually open the panel,
         as doing it after causes it to stick from the last selection for some reason. */
-       if ([fDstFormatPopUp indexOfSelectedItem] == 0 && [fDstCodecsPopUp indexOfSelectedItem] == 1 && [fVidEncoderPopUp indexOfSelectedItem] == 0)
+       if ([fDstFormatPopUp indexOfSelectedItem] == 0 && [fDstCodecsPopUp indexOfSelectedItem] == 1)
        {
                [fPresetNewX264Opt setEditable: YES];
                [fPresetNewX264OptLabel setEnabled: YES];
@@ -1930,10 +1930,14 @@ the user is using "Custom" settings by determining the sender*/
        //[preset setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
        
        /*Audio*/
-       /* Audio Language One*/
+       /* Audio track one*/
        [preset setObject:[fAudLang1PopUp titleOfSelectedItem] forKey:@"AudioLang1"];
-       /* Audio Language One Surround Sound Checkbox*/
-       [preset setObject:[NSNumber numberWithInt:0] forKey:@"AudioLang1Surround"];
+       /* Track one mixdown dpl2*/
+       [preset setObject:[NSString stringWithCString:"stereo"] forKey:@"AudioLang1Mixdown"];
+    /* Audio track two */
+       [preset setObject:[NSString stringWithFormat:@"None"] forKey:@"AudioLang2"];
+       /* Track two mixdown */
+       [preset setObject:[NSString stringWithCString:""] forKey:@"AudioLang2Mixdown"];
        /* Audio Sample Rate*/
        [preset setObject:@"44.1" forKey:@"AudioSampleRate"];
        /* Audio Bitrate Rate*/
@@ -2004,14 +2008,18 @@ the user is using "Custom" settings by determining the sender*/
        //[preset setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
        
        /*Audio*/
-       /* Audio Language One*/
+       /* Audio track one*/
        [preset setObject:[fAudLang1PopUp titleOfSelectedItem] forKey:@"AudioLang1"];
-       /* Audio Language One Surround Sound Checkbox*/
-       [preset setObject:[NSNumber numberWithInt:0] forKey:@"AudioLang1Surround"];
+       /* Track one mixdown dpl2*/
+       [preset setObject:[NSString stringWithCString:"dpl2"] forKey:@"AudioLang1Mixdown"];
+    /* Audio track two */
+       [preset setObject:[NSString stringWithFormat:@"None"] forKey:@"AudioLang2"];
+       /* Track two mixdown */
+       [preset setObject:[NSString stringWithCString:""] forKey:@"AudioLang2Mixdown"];
        /* Audio Sample Rate*/
        [preset setObject:@"44.1" forKey:@"AudioSampleRate"];
        /* Audio Bitrate Rate*/
-       [preset setObject:@"320" forKey:@"AudioBitRate"];
+       [preset setObject:@"160" forKey:@"AudioBitRate"];
        /* Subtitles*/
        [preset setObject:@"None" forKey:@"Subtitles"];
        
@@ -2041,7 +2049,7 @@ the user is using "Custom" settings by determining the sender*/
        /* Video encoder */
        [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
        /* x264 Option String (We can use this to tweak the appleTV output)*/
-       [preset setObject:@"level=30" forKey:@"x264Option"];
+       [preset setObject:@"level=41" forKey:@"x264Option"];
        /* Video quality */
        [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"];
        [preset setObject:[fVidTargetSizeField stringValue] forKey:@"VideoTargetSize"];
@@ -2075,10 +2083,14 @@ the user is using "Custom" settings by determining the sender*/
        //[preset setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
        
        /*Audio*/
-       /* Audio Language One*/
+       /* Audio track one*/
        [preset setObject:[fAudLang1PopUp titleOfSelectedItem] forKey:@"AudioLang1"];
-       /* Audio Language One Surround Sound Checkbox*/
-       [preset setObject:[NSNumber numberWithInt:0] forKey:@"AudioLang1Surround"];
+       /* Track one mixdown dpl2*/
+       [preset setObject:[NSString stringWithCString:"dpl2"] forKey:@"AudioLang1Mixdown"];
+    /* Audio track two */
+       [preset setObject:[NSString stringWithFormat:@"None"] forKey:@"AudioLang2"];
+       /* Track two mixdown */
+       [preset setObject:[NSString stringWithCString:""] forKey:@"AudioLang2Mixdown"];
        /* Audio Sample Rate*/
        [preset setObject:@"44.1" forKey:@"AudioSampleRate"];
        /* Audio Bitrate Rate*/

diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 1f041f6..f2a8863 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -9,7 +9,7 @@
                <key>1843</key>
                <string>610 276 220 592 0 0 1440 878 </string>
                <key>29</key>
-               <string>16 1134 365 44 0 0 1920 1178 </string>
+               <string>11 834 365 44 0 0 1440 878 </string>
        </dict>
        <key>IBFramework Version</key>
        <string>446.1</string>
@@ -20,6 +20,7 @@
        <key>IBOpenObjects</key>
        <array>
                <integer>29</integer>
+               <integer>1867</integer>
                <integer>21</integer>
        </array>
        <key>IBSystem Version</key>

diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 21448ee..91f2abb 100644 (file)
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ