From: Rudolf Polzer <divVerent@alientrap.org>
Date: Thu, 5 Aug 2010 13:33:03 +0000 (+0200)
Subject: also handle wav-to-ogg
X-Git-Tag: xonotic-v0.1.0preview~329^2~5
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=6aa2490fa917dab4748a8bcb9b741a406fd76de7

also handle wav-to-ogg
---

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 99800c53..7cd23ff7 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -100,7 +100,7 @@ reduce_jpeg_jpeg()
 	cp "$i" "$o" && jpegoptim --strip-all -m"$1" "$o"
 }
 
-reduce_ogg()
+reduce_ogg_ogg()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
@@ -108,6 +108,13 @@ reduce_ogg()
 	oggenc -q"$1" -o "$o" "$tmpdir/x.wav"
 }
 
+reduce_wav_ogg()
+{
+	i=$1; shift; shift
+	o=$1; shift; shift
+	oggenc -q"$1" -o "$o" "$i"
+}
+
 reduce_rgba_dds()
 {
 	i=$1; shift; shift
@@ -165,7 +172,9 @@ for F in "$@"; do
 			# handle in *.jpg case
 
 			# they always got converted, I assume
-			conv=true
+			if $do_dds || $do_jpeg; then
+				conv=true
+			fi
 			keep=$do_jpeg
 			;;
 		*.jpg)
@@ -192,7 +201,10 @@ for F in "$@"; do
 			rm -f "$F.hasalpha"
 			;;
 		*.ogg)
-			cached "$do_ogg" reduce_ogg "$F" "" "$F" "" "$ogg_qual"
+			cached "$do_ogg" reduce_ogg_ogg "$F" "" "$F" "" "$ogg_qual"
+			;;
+		*.wav)
+			cached "$do_ogg" reduce_wav_ogg "$F" "" "$F" "" "$ogg_qual"
 			;;
 	esac
 	if $del_src; then