Compare commits
3 Commits
fc02fc5ffe
...
master
Author | SHA1 | Date | |
---|---|---|---|
c2954c38de | |||
864b03b6e0 | |||
5a457b4dd0 |
41
tojam
41
tojam
@ -226,10 +226,6 @@ configure_ninjam() {
|
||||
;;
|
||||
"tts")
|
||||
if [[ "${tts}" == "true" ]]; then
|
||||
ttsRate="$(dialog --backtitle "Tojam" \
|
||||
--rangebox "TTS Rate (0-10):" 8 50 0 10 "${ttsRate}" --stdout)"
|
||||
menuCode=$?
|
||||
[[ ${menuCode} -ne 0 ]] && continue
|
||||
tts="$(dialog --yes-label "Enable" \
|
||||
--no-label "Disable" \
|
||||
--yesno "Text-to-Speech is currently enabled at rate ${ttsRate}. Change setting?" -1 -1 --stdout)"
|
||||
@ -237,6 +233,12 @@ configure_ninjam() {
|
||||
[[ ${tts} -eq 255 ]] && continue
|
||||
tts="${tts/0/true}"
|
||||
tts="${tts/1/false}"
|
||||
if [[ "${tts}" == "true" ]]; then
|
||||
ttsRate="$(dialog --backtitle "Tojam" \
|
||||
--rangebox "TTS Rate (0-10):" 8 50 0 10 "${ttsRate}" --stdout)"
|
||||
menuCode=$?
|
||||
[[ ${menuCode} -ne 0 ]] && continue
|
||||
fi
|
||||
else
|
||||
tts="$(dialog --yes-label "Enable" \
|
||||
--no-label "Keep Disabled" \
|
||||
@ -252,12 +254,29 @@ configure_ninjam() {
|
||||
[[ ${menuCode} -ne 0 ]] && continue
|
||||
fi
|
||||
fi
|
||||
sed -i -e "s/^tts=.*/tts=\"${tts}\"/" -e "s/^ttsRate=.*/ttsRate=\"${ttsRate}\"/" "${config}/config" &&
|
||||
if [[ "${tts}" == "true" ]]; then
|
||||
dialog --msgbox "TTS enabled at rate ${ttsRate}." -1 -1
|
||||
# Update or remove TTS settings
|
||||
if [[ "${tts}" == "true" ]]; then
|
||||
# Add or update TTS settings
|
||||
if grep -q "^tts=" "${config}/config"; then
|
||||
sed -i "s/^tts=.*/tts=\"${tts}\"/" "${config}/config"
|
||||
else
|
||||
dialog --msgbox "TTS disabled." -1 -1
|
||||
echo "tts=\"${tts}\"" >> "${config}/config"
|
||||
fi
|
||||
if grep -q "^ttsRate=" "${config}/config"; then
|
||||
sed -i "s/^ttsRate=.*/ttsRate=\"${ttsRate}\"/" "${config}/config"
|
||||
else
|
||||
echo "ttsRate=\"${ttsRate}\"" >> "${config}/config"
|
||||
fi
|
||||
else
|
||||
# Remove TTS settings when disabled
|
||||
sed -i '/^tts=/d' "${config}/config"
|
||||
sed -i '/^ttsRate=/d' "${config}/config"
|
||||
fi
|
||||
if [[ "${tts}" == "true" ]]; then
|
||||
dialog --msgbox "TTS enabled at rate ${ttsRate}." -1 -1
|
||||
else
|
||||
dialog --msgbox "TTS disabled." -1 -1
|
||||
fi
|
||||
;;
|
||||
"username")
|
||||
userName="$(dialog --backtitle "Tojam" \
|
||||
@ -283,7 +302,7 @@ save_files() {
|
||||
fi
|
||||
}
|
||||
|
||||
tts_flags() {
|
||||
ttsFlags() {
|
||||
if [[ "${tts}" == "true" ]]; then
|
||||
echo "-tts -tts-rate ${ttsRate}"
|
||||
fi
|
||||
@ -390,7 +409,7 @@ esac
|
||||
ninjam="$(command -v cninjam 2> /dev/null)"
|
||||
[[ ${#ninjam} -le 3 ]] && { echo "Could not find cninjam."; exit 1; }
|
||||
if [[ "${soundDriver}" == "jack" ]]; then
|
||||
$ninjam "${server}" -user "${userName}" -jack -sessiondir "${sessiondir}" ${saveSourceFiles} $(save_files) $(tts_flags)
|
||||
$ninjam "${server}" -user "${userName}" -jack -sessiondir "${sessiondir}" ${saveSourceFiles} $(save_files) $(ttsFlags)
|
||||
else
|
||||
$ninjam "${server}" -user "${userName}" -alsaconfig "${alsaParameters}" -sessiondir "${sessiondir}" ${saveSourceFiles} $(save_files) $(tts_flags)
|
||||
$ninjam "${server}" -user "${userName}" -alsaconfig "${alsaParameters}" -sessiondir "${sessiondir}" ${saveSourceFiles} $(save_files) $(ttsFlags)
|
||||
fi
|
||||
|
Reference in New Issue
Block a user