1
0
Fork 0
forked from len0rd/rockbox

Do not prompt for encoder and tts options. They are now command line only.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23895 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2009-12-08 10:24:59 +00:00
parent 953f4d4acc
commit f5ef0b9f10

29
tools/configure vendored
View file

@ -628,19 +628,12 @@ voiceconfig () {
echo "(voice_$TTS_FESTIVAL_VOICE)" > festival-prolog.scm echo "(voice_$TTS_FESTIVAL_VOICE)" > festival-prolog.scm
fi fi
# Allow the user to input manual commandline options # Read custom tts options from command line
if [ "$ARG_TTSOPTS" ]; then if [ "$ARG_TTSOPTS" ]; then
USER_TTS_OPTS=$ARG_TTSOPTS TTS_OPTS="$ARG_TTS_OPTS"
else advopts="$advopts --ttsopts='$TTS_OPTS'"
printf "Enter $TTS_ENGINE options (enter for defaults \"$TTS_OPTS\"): " echo "$TTS_ENGINE options set to $TTS_OPTS"
USER_TTS_OPTS=`input`
echo ""
fi fi
advopts="$advopts --ttsopts='$USER_TTS_OPTS'"
if [ -n "$USER_TTS_OPTS" ]; then
TTS_OPTS="$USER_TTS_OPTS"
fi
echo "$TTS_ENGINE options set to $TTS_OPTS"
if [ "$swcodec" = "yes" ]; then if [ "$swcodec" = "yes" ]; then
ENCODER="rbspeexenc" ENCODER="rbspeexenc"
@ -660,18 +653,12 @@ voiceconfig () {
echo "Using $ENCODER for encoding voice clips" echo "Using $ENCODER for encoding voice clips"
# Allow the user to input manual commandline options # Read custom encoder options from command line
if [ "$ARG_ENCOPTS" ]; then if [ "$ARG_ENCOPTS" ]; then
USER_ENC_OPTS=$ARG_ENCOPTS ENC_OPTS="$ARG_ENCOPTS"
else advopts="$advopts --encopts='$ENC_OPTS'"
printf "Enter $ENCODER options (enter for defaults \"$ENC_OPTS\"): " echo "$ENCODER options set to $ENC_OPTS"
USER_ENC_OPTS=`input`
fi fi
advopts="$advopts --encopts='$USER_ENC_OPTS'"
if [ -n "$USER_ENC_OPTS" ]; then
ENC_OPTS=$USER_ENC_OPTS
fi
echo "$ENCODER options set to $ENC_OPTS"
TEMPDIR="${pwd}" TEMPDIR="${pwd}"
if [ -n "`findtool cygpath`" ]; then if [ -n "`findtool cygpath`" ]; then