From: Samual <samual@xonotic.org>
Date: Wed, 4 Jan 2012 16:48:12 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~30^2~46^2
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=d9449ca0d4a61f496433f046969e722aefc02477;hp=a39370ebba15e56b74b1a4a93ef0cd5abb5e84f3

Merge remote branch 'origin/master' into samual/updatecommands
---

diff --git a/all b/all
index b451ac7d..04196952 100755
--- a/all
+++ b/all
@@ -1802,7 +1802,8 @@ case "$cmd" in
 		verbose export jpeg_qual_rgb=97
 		verbose export jpeg_qual_a=99
 		verbose export do_dds=false
-		verbose export do_ogg=false
+		verbose export do_ogg=true
+		verbose export ogg_ogg=false
 		verbose export del_src=true
 		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
@@ -1818,6 +1819,7 @@ case "$cmd" in
 		verbose export do_dds=true
 		verbose export dds_flags=
 		verbose export do_ogg=true
+		verbose export ogg_ogg=false
 		verbose export del_src=true
 		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index aa4089c1..ff69cbb5 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -10,7 +10,8 @@ set -e
 : ${do_dds:=true}
 : ${dds_tool:=compressonator-dxtc}
 : ${do_ogg:=false}
-: ${ogg_qual:=1}
+: ${ogg_ogg:=true}
+: ${ogg_qual:=2}
 : ${del_src:=false}
 : ${git_src_repo:=}
 : ${dds_noalpha:=dxt1}
@@ -347,6 +348,11 @@ for F in "$@"; do
 	will_jpeg=$do_jpeg
 	will_dds=$do_dds
 	will_ogg=$do_ogg
+	if ! $ogg_ogg; then
+		case "$f" in
+			*.ogg) will_ogg=false ;;
+		esac
+	fi
 	case "$f" in
 		./sounds/misc/talk*.wav) will_ogg=false ;; # engine "feature"
 		*_bump) will_dds=false ;;