From: Alan J. Pippin <ajp@pippin.pippins.net>
Date: Fri, 4 Jun 2010 20:25:32 +0000 (-0600)
Subject: Fixed default 6ch audio option. It wasn't truly the default before.
X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/static/%7Bview%7D?a=commitdiff_plain;h=1e18cc7c37d1ec8560f6164d031dbc04b02ed948;p=rip_dvd%2F.git

Fixed default 6ch audio option. It wasn't truly the default before.
Now it will be unless another audio option is specified.
---

diff --git a/rip_dvd b/rip_dvd
index 6339d29..ae6f950 100755
--- a/rip_dvd
+++ b/rip_dvd
@@ -57,7 +57,7 @@ typeset -i target_video_bitrate=2000
 typeset -i target_audio_bitrate=224
 typeset -i target_size=0
 typeset -i audio_2ch=0
-typeset -i audio_6ch=1
+typeset -i audio_6ch=0
 typeset -i invalid_feature_title=0
 typeset -i feature_title_override=0
 typeset -i mplayer_dumpstream_incompatibility=0
@@ -232,6 +232,12 @@ if [ $mirror_mode -eq 1 ]; then
   fi
 fi
 
+# If audio channel requirements weren't given, assume a default value of 6channel audio
+if [ $audio_2ch -eq 0 ] && [ $audio_6ch -eq 0 ]; then
+  audio_6ch=1
+  custom_audio_6ch=1
+fi
+
 # Make handbrake the default encoder if not specified and we can find it
 if [ -z "$encoder" ]; then
   encoder="mencoder"; # If we can't find handbrake, set mencoder as the default