noneinfo01/IPod-Shuffle-4g
1
0
Fork 0
forked from upstream/IPod-Shuffle-4g
Code Pull requests Activity

Add support for using espeak when pico2wave not available.

Browse source
This commit is contained in:
Thomas Hori / Harriet Riddle 2016-03-20 14:43:27 +00:00
parent 7d628df3e8
commit 7d07168c0d
2 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
shuffle.py
View file

@ -51,13 +51,14 @@ def validate_unicode(path):
def exec_exists_in_path(command):
with open(os.devnull, 'w') as FNULL:
try:
subprocess.call([command], stdout=FNULL, stderr=subprocess.STDOUT)
return True
with open(os.devnull, 'r') as RFNULL:
subprocess.call([command], stdout=FNULL, stderr=subprocess.STDOUT, stdin=RFNULL)
return True
except OSError as e:
return False
class Text2Speech(object):
valid_tts = {'pico2wave': True, 'RHVoice': True}
valid_tts = {'pico2wave': True, 'RHVoice': True, 'espeak': True}
@staticmethod
def check_support():
@ -70,6 +71,13 @@ class Text2Speech(object):
else:
voiceoverAvailable = True
# Check for espeak voiceover
if not exec_exists_in_path("espeak"):
Text2Speech.valid_tts['espeak'] = False
print "Error executing espeak, voicever won't be generated using it."
else:
voiceoverAvailable = True
# Check for Russian RHVoice voiceover
if not exec_exists_in_path("RHVoice"):
Text2Speech.valid_tts['RHVoice'] = False
@ -94,9 +102,17 @@ class Text2Speech(object):
text = unicode(text, 'utf-8')
lang = Text2Speech.guess_lang(text)
if lang == "ru-RU":
return Text2Speech.rhvoice(out_wav_path, text)
if Text2Speech.valid_tts['RHVoice']:
return Text2Speech.rhvoice(out_wav_path, text)
else:
return False
else:
return Text2Speech.pico2wave(out_wav_path, text)
if Text2Speech.valid_tts['pico2wave']:
return Text2Speech.pico2wave(out_wav_path, text)
elif Text2Speech.valid_tts['espeak']:
return Text2Speech.espeak(out_wav_path, text)
else:
return False
# guess-language seems like an overkill for now
@staticmethod
@ -113,6 +129,13 @@ class Text2Speech(object):
subprocess.call(["pico2wave", "-l", "en-GB", "-w", out_wav_path, unicodetext])
return True
@staticmethod
def espeak(out_wav_path, unicodetext):
if not Text2Speech.valid_tts['espeak']:
return False
subprocess.call(["espeak", "-v", "english_rp", "-w", out_wav_path, unicodetext])
return True
@staticmethod
def rhvoice(out_wav_path, unicodetext):
if not Text2Speech.valid_tts['RHVoice']:
@ -399,7 +422,7 @@ class Playlist(Record):
def set_master(self, tracks):
# By default use "All Songs" builtin voiceover (dbid all zero)
# Else generate alternative "All Songs" to fit the speaker voice of other playlists
if self.voiceover and Text2Speech.valid_tts['pico2wave']:
if self.voiceover and (Text2Speech.valid_tts['pico2wave'] or Text2Speech.valid_tts['espeak']):
self["dbid"] = hashlib.md5("masterlist").digest()[:8] #pylint: disable-msg=E1101
self.text_to_speech("All songs", self["dbid"], True)
self["listtype"] = 1