Browse Source

Change to **kwargs

Unknown 8 years ago
parent
commit
f9ee694088

+ 1 - 6
tts/TTS.py

@@ -24,12 +24,7 @@ class TTS:
     def say_generic(self, cache, language, words, get_audio_specific, audio_type, audio_frequency, voice=None):
         file_path = self.cache.get_audio_file_cache_path(words, language, voice)
 
-        if voice is None:
-            return_code = get_audio_specific(language, words, file_path, cache)
-        else:
-            return_code = get_audio_specific(language, words, file_path, cache, voice)
-
-        if return_code:
+        if get_audio_specific(language=language, words=words, file_path=file_path, cache=cache, voice=voice):
             self.play_audio(file_path, audio_type, audio_frequency, cache)
 
     @staticmethod

+ 7 - 1
tts/acapela/acapela.py

@@ -24,7 +24,13 @@ class Acapela(TTS):
     def say(self, words=None, language=TTS_LANGUAGES_DEFAULT, voice=TTS_VOICE_DEFAULT, cache=True):
         self.say_generic(cache, language, words, self.get_audio_acapela, AudioPlayer.PLAYER_MP3, AudioPlayer.AUDIO_MP3_22050_FREQUENCY, voice)
 
-    def get_audio_acapela(self, language, words, file_path, cache, voice):
+    def get_audio_acapela(self, **kwargs):
+        language = kwargs.get('language', None)
+        words = kwargs.get('words', None)
+        cache = kwargs.get('cache', None)
+        file_path = kwargs.get('file_path', None)
+        voice = kwargs.get('voice', None)
+
         payload = {
             "MyLanguages": language,
             "MySelectedVoice": voice,

+ 6 - 1
tts/googletts/googletts.py

@@ -19,7 +19,12 @@ class Googletts(TTS):
     def say(self, words=None, language=TTS_LANGUAGES_DEFAULT, cache=True):
         self.say_generic(cache, language, words, self.get_audio_googletts, AudioPlayer.PLAYER_MP3, 25000)
 
-    def get_audio_googletts(self, language, words, file_path, cache):
+    def get_audio_googletts(self, **kwargs):
+        words = kwargs.get('words', None)
+        cache = kwargs.get('cache', None)
+        file_path = kwargs.get('file_path', None)
+        language = kwargs.get('language', None)
+
         payload = {
             "q": words,
             "tl": language,

+ 5 - 1
tts/pico2wave/pico2wave.py

@@ -19,6 +19,10 @@ class Pico2wave(TTS):
         self.say_generic(cache, language, words, self.get_audio_pico2wave, AudioPlayer.PLAYER_WAV, AudioPlayer.AUDIO_MP3_FREQUENCY)
 
     @staticmethod
-    def get_audio_pico2wave(language, words, file_path, cache):
+    def get_audio_pico2wave(**kwargs):
+        language = kwargs.get('language', None)
+        words = kwargs.get('words', None)
+        file_path = kwargs.get('file_path', None)
+
         subprocess.check_output(["/usr/bin/pico2wave", "-l=%s" % language, "-w=%s" % file_path, words], stderr=sys.stderr)
         return True

+ 6 - 1
tts/voicerss/voicerss.py

@@ -19,7 +19,12 @@ class Voicerss(TTS):
     def say(self, words=None, language=TTS_LANGUAGES_DEFAULT, cache=True):
         self.say_generic(cache, language, words, self.get_audio_voicerss, AudioPlayer.PLAYER_MP3, AudioPlayer.AUDIO_MP3_44100_FREQUENCY)
 
-    def get_audio_voicerss(self, language, words, file_path, cache):
+    def get_audio_voicerss(self, **kwargs):
+        words = kwargs.get('words', None)
+        cache = kwargs.get('cache', None)
+        file_path = kwargs.get('file_path', None)
+        language = kwargs.get('language', None)
+
         payload = {
             "src": words,
             "hl": language,

+ 6 - 1
tts/voxygen/voxygen.py

@@ -20,7 +20,12 @@ class Voxygen(TTS):
     def say(self, words=None, voice=TTS_VOICE_DEFAULT, language=TTS_LANGUAGES_DEFAULT, cache=True):
         self.say_generic(cache, language, words, self.get_audio_voxygen, AudioPlayer.PLAYER_MP3, AudioPlayer.AUDIO_MP3_FREQUENCY, voice)
 
-    def get_audio_voxygen(self, language, words, file_path, cache, voice):
+    def get_audio_voxygen(self, **kwargs):
+        words = kwargs.get('words', None)
+        cache = kwargs.get('cache', None)
+        file_path = kwargs.get('file_path', None)
+        voice = kwargs.get('voice', None)
+
         payload = {
             "method": "redirect",
             "text": words,