diff options
| author | dynaflash <[email protected]> | 2007-04-04 20:04:43 +0000 |
|---|---|---|
| committer | dynaflash <[email protected]> | 2007-04-04 20:04:43 +0000 |
| commit | 50b599d43307ac4829627e92f775dfa9052bf444 (patch) | |
| tree | 049505e5dfa80573a3e9ebefb769b624f3cab261 | |
| parent | d8816f075ebda1282103e2998efa0bcf1a63662b (diff) | |
MacGui: disable Vorbis 6 channel encoding since it is broken in libhb.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@477 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | macosx/Controller.mm | 8 | ||||
| -rw-r--r-- | macosx/English.lproj/MainMenu.nib/info.nib | 3 | ||||
| -rw-r--r-- | macosx/English.lproj/MainMenu.nib/keyedobjects.nib | bin | 99773 -> 99716 bytes |
3 files changed, 6 insertions, 5 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm index f3e6133c1..c6232f308 100644 --- 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 67a0fec86..d9bcb81bf 100644 --- 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 Binary files differindex 581ea6c23..2fbc34397 100644 --- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib +++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib |