Some small amendments to the 6-channel AAC GUI code:

- selecting a non-exportable setting (a non-5.1 track, or a non-AAC codec) now unchecks fAudLang1SurroundCheck as well as disabling it

- selecting the iPod video setting "MP4 file, AVC/H.264 Video, x264 (h.264 iPod)" will uncheck fAudLang1SurroundCheck, in a similar way to the way it turns off anamorphic

- fixed a small bug in the code that checks for when the iPod video setting is selected, to ensure it checks all three popups (previously the codecs popup wasn't being checked, meaning that selecting "MP4 file, MPEG-3 Video, XviD" would also turn off anamorphic)

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2_5.1@322 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 5635fd5dcd0cd50791ec898263f39a7ba8789821..ac30eef9b887db58b1eb1a9247b7ab80d3d2b91a 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1159,7 +1159,7 @@ static int FormatSettings[3][4] =
 {
     
        /* Check to see if we need to modify the job pic values based on x264 (iPod) encoder selection */
-    if ([fDstFormatPopUp indexOfSelectedItem] == 0 && [fVidEncoderPopUp indexOfSelectedItem] == 1)
+    if ([fDstFormatPopUp indexOfSelectedItem] == 0 && [fDstCodecsPopUp indexOfSelectedItem] == 1 && [fVidEncoderPopUp indexOfSelectedItem] == 1)
     {
        hb_job_t * job = fTitle->job;
        job->pixel_ratio = 0 ;
@@ -1175,6 +1175,10 @@ static int FormatSettings[3][4] =
                 hb_fix_aspect( job, HB_KEEP_WIDTH );
                 
                 }
+
+               /* uncheck the "export 5.1 as 6-channel AAC" checkbox if it is checked */
+               [fAudLang1SurroundCheck setState: NSOffState];
+
        }
     
        [self CalculatePictureSizing: sender];    
@@ -1234,6 +1238,8 @@ static int FormatSettings[3][4] =
                [fAudLang1SurroundCheck setEnabled: YES];
        } else {
                [fAudLang1SurroundCheck setEnabled: NO];
+               /* as well as disabling the checkbox, let's uncheck it if it is checked */
+               [fAudLang1SurroundCheck setState: NSOffState];
        }
 
 }