MacGui: disable Vorbis 6 channel encoding since it is broken in libhb.

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

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index f3e6133..c6232f3 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -851,7 +851,7 @@ static int FormatSettings[3][4] =
     job->abitrate = hb_audio_bitrates[[fAudBitratePopUp
                         indexOfSelectedItem]].rate;
        /* have we selected that 5.1 should be extracted as AAC? */
-       if ((job->acodec == HB_ACODEC_FAAC || job->acodec == HB_ACODEC_VORBIS) && [fAudLang1SurroundCheck isEnabled] && [fAudLang1SurroundCheck state] == NSOnState) {
+       if (job->acodec == HB_ACODEC_FAAC && [fAudLang1SurroundCheck isEnabled] && [fAudLang1SurroundCheck state] == NSOnState) {
                job->surround = 1;
        } else {
                job->surround = 0;
@@ -1367,8 +1367,8 @@ static int FormatSettings[3][4] =
     int codecs = [fDstCodecsPopUp indexOfSelectedItem];
        int acodec = FormatSettings[format][codecs] & HB_ACODEC_MASK;
 
-       /* we only offer the option to extract 5.1 to 6-channel if the selected audio codec is AAC or Vorbis*/
-       if (acodec == HB_ACODEC_FAAC || acodec == HB_ACODEC_VORBIS) {
+       /* we only offer the option to extract 5.1 to 6-channel if the selected audio codec is AAC*/
+       if (acodec == HB_ACODEC_FAAC) {
 
                bool doneaudios = false;
                int thisaudio = 0;
@@ -1391,7 +1391,7 @@ static int FormatSettings[3][4] =
                }
        }
 
-    /* If we are extracting to AAC or Vorbis, and any of our soundtracks were 5.1, then enable the checkbox  */
+    /* If we are extracting to AAC, and any of our soundtracks were 5.1, then enable the checkbox  */
        if (foundfiveoneaudio) {
                [fAudLang1SurroundCheck setEnabled: YES];
                /* Check default surround sound pref and if it is YES, lets also check the checkbox */

diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 67a0fec..d9bcb81 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -19,8 +19,9 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>21</integer>
                <integer>29</integer>
+               <integer>1438</integer>
+               <integer>21</integer>
                <integer>1867</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 581ea6c..2fbc343 100644 (file)
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ