From 5d17502aa2abb8221c3440b16b4501691792e55a Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 4 Jan 2012 11:38:46 +0100 Subject: [PATCH] better solution: avoid ogg->ogg bitrate reduction in release builds, but continue to do wav->ogg --- all | 6 ++++-- misc/tools/cached-converter.sh | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/all b/all index f515d3a0..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 ;; @@ -1817,7 +1818,8 @@ case "$cmd" in verbose export jpeg_qual_a=99 verbose export do_dds=true verbose export dds_flags= - 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 ;; 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 ;; -- 2.39.2