From: dynaflash <dynaflash@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Date: Tue, 18 Sep 2007 17:58:23 +0000 (+0000)
Subject: MacGui:  Add conditional to 6 channel vorbis to remove < 192 bitrates from popup... 
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=b101732f4ef7daa23becefef1f0440aaece9cca3;p=handbrake-jp%2Fhandbrake-jp-git.git

MacGui:  Add conditional to 6 channel vorbis to remove < 192 bitrates from popup, since vorbis crashes in a fiery wreck.

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

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index e698a0ee..6cf95624 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -2621,11 +2621,22 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
             break;
 
         case HB_ACODEC_VORBIS:
+        if ([[fAudTrack1MixPopUp selectedItem] tag] == HB_AMIXDOWN_6CH || [[fAudTrack2MixPopUp selectedItem] tag] == HB_AMIXDOWN_6CH)
+            {
+                /* Vorbis causes a crash if we use a bitrate below 192 kbps with 6 channel */
+                minbitrate = 192;
+                /* If either mixdown popup includes 6-channel discrete, then allow up to 384 kbps */
+                maxbitrate = 384;
+                break;
+            }
+            else
+            {
             /* Vorbis causes a crash if we use a bitrate below 48 kbps */
             minbitrate = 48;
             /* Vorbis can cope with 384 kbps quite happily, even for stereo */
             maxbitrate = 384;
             break;
+            }
 
         default:
             /* AC3 passthru disables the bitrate dropdown anyway, so we might as well just use the min and max bitrate */