diff --git a/README.md b/README.md index ecd6d32..f5a3c74 100644 --- a/README.md +++ b/README.md @@ -21,16 +21,16 @@ talking-clock understands the following arguments: ogg123 -q or paplay -Note that with the ogg123 command the aplay command is used for the pico voice. Aplay will not work for the rest of the commands because it does not play ogg files. -c --nochime Turn off chimes. -k --key Your weatherstack.com api key. You can get one for free from weatherstack.com -n --nospeak turn off spoken time. -s --soundpack Set path to soundpack. Sound packs should be in ogg format and contain 1.ogg, 2.ogg, ... 11.ogg, 12.ogg and 15.ogg, 30.ogg, and 45.ogg for the quarter-hour chimes. -v --voice Select voice. Default is espeak other options are -cepstral, espeak, festival, flite, flite_time, gama_tts, googletts (requires the translate-shell package), pico, sam, speech-dispatcher and custom. +cepstral, espeak, festival, flite, flite_time, gama_tts, googletts (requires the translate-shell package), rhvoice-(voicename), sam, speech-dispatcher and custom. If your tts files for gama_tts are somewhere other than /usr/local/share/gama_tts/data/english/ then you can specify it in your ~/.config/talking-clock/talking-clockrc. Just do gama_tts_path="/path/to/tts/vtmN where N is the number you want. To set a custom voice enter the command as in: -v 'espeak -v en-us+klatt2' +Note that rhvoice requires a - followed by the voice name you want, for example, rhvoice-bdl or rhvoice-alan. zipcode and flite_time are incompatable. If you have zipcode set the temperature will not be read while using flite_time. -z --zipcode Postal code: Will speak the temperature along with the time so long as you do not have nospeak set. E.G. -z 90210. @@ -49,7 +49,7 @@ speak=true zipcode=90210 Soundpack should be the path to a directory. Do not include the trailing / talking-clock adds it for you. voice=espeak -v en-us+klatt2 -s 300 -Be careful when using custom voice commands, if it is not valid the program will not work. You do not have to specify parameters for voice commands if you want to use the defaults. You can use voice=espeak (this is the default), voice=cepstral, voice=speech-dispatcher, voice=pico, or voice=festival. +Be careful when using custom voice commands, if it is not valid the program will not work. You do not have to specify parameters for voice commands if you want to use the defaults. You can use voice=espeak (this is the default), voice=cepstral, voice=speech-dispatcher, voice=rhvoice-bdl, or voice=festival. Creating soundpacks is very simple. Make a directory named anything you wish, thunderstorm for example, and place files inside it. The naming scheme for soundpack files follows the hours 1 through 12 and quarter hours 15, 30, 45. Each sound file must be in .ogg format. So, your directory will contain 1.ogg, 2.ogg, ... 12.ogg, 15.ogg, 30.ogg, and 45.ogg. If hourly chimes sound the same, use a bell for example, just name the chime bell.ogg. If hourly chimes should be prepended with a sound, then name the sound prepend.ogg, will play at each hour, before the chimes.To download or submit soundpacks go to: https://stormdragon.tk/talking-clock/ diff --git a/src/talking-clock b/src/talking-clock index 5ba3f7a..fda11eb 100755 --- a/src/talking-clock +++ b/src/talking-clock @@ -20,9 +20,10 @@ half-hour, 4 every quarter, and anything else will delete your existing settings -s --soundpack Set path to soundpack. Sound packs should be in ogg format and contain 1.ogg, 2.ogg, ... 11.ogg, 12.ogg and 15, 30, and 45.oggfor the quarter-hour chimes. -v --voice Select voice. Default is espeak other options are -cepstral, espeak, festival, gama_tts, pico, sam, speech-dispatcher and custom. +cepstral, espeak, festival, gama_tts, rhvoice-(voicename), sam, speech-dispatcher and custom. To set a custom voice enter the command as in: -v 'espeak -v en-us+klatt2' +rhvoice is a special case, you must include the name of the voice you want as in rhvoice-bdl -z --zipcode postal code Used for current temperature, may not be available inn all areas. For complete information read the README located at /usr/share/talking-clock/README" EOF @@ -413,14 +414,8 @@ if [ "$speakTime" == "true" ] ; then "speech-dispatcher") spd-say -w -P important "$timeString" ;; - "pico") - pico2wave -w $voiceFile "$timeString" - #ogg123 doesn't do wav, so hopefully everyone has aplay... - if [[ "$soundCommand" == "ogg123" || "$soundCommand" == "ogg123 -q" ]] ; then - aplay -q $voiceFile - else - $soundCommand $voiceFile - fi + "rhvoice-"*) + echo "$timeString" | RHVoice-test -p "${voice##*-}" ;; *) $voice "$timeString"