storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

did some renaming for members

Browse Source
This commit is contained in:
chrys 2016-07-07 01:07:46 +02:00
parent e5641f80d7
commit cfc1dfb1ca
3 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fenrir.py
View File

@ -7,7 +7,7 @@ import hashlib
import difflib import difflib
import textwrap import textwrap
import speech.es as es import speech.es as es
#import speech.sd as sd import speech.sd as sd
runtime = { runtime = {
'running':True, 'running':True,
@ -25,8 +25,8 @@ runtime = {
'newContentAttrib': b'', 'newContentAttrib': b'',
'oldTTY':'0', 'oldTTY':'0',
'newTTY':'0', 'newTTY':'0',
'speechDriverString':'es', 'speechDriverString':'sd',
'speechDriver': es.speech() 'speechDriver': sd.speech()
} }
while(runtime['running']): while(runtime['running']):

32
src/speech/es.py
View File

@ -4,48 +4,48 @@
class speech(): class speech():
def __init__(self, ): def __init__(self, ):
self.es = None self._es = None
self.isInitialized = False self._isInitialized = False
try: try:
from espeak import espeak from espeak import espeak
self.es = espeak self._es = espeak
self.isInitialized = True self._isInitialized = True
except: except:
self.initialized = False self._initialized = False
def speak(self,text, queueable=True): def speak(self,text, queueable=True):
if not self.isInitialized: if not self._isInitialized:
return False return False
if queueable == False: self.cancel() if queueable == False: self.cancel()
self.es.synth(text) self._es.synth(text)
return True return True
def cancel(self): def cancel(self):
if not self.isInitialized: if not self._isInitialized:
return False return False
self.es.cancel() self._es.cancel()
return True return True
def clear_buffer(self): def clear_buffer(self):
if not self.isInitialized: if not self._isInitialized:
return False return False
return True return True
def setVoice(self, voice): def setVoice(self, voice):
if not self.isInitialized: if not self._isInitialized:
return False return False
return es.set_voice('de') return _es.set_voice('de')
def setPitch(self, pitch): def setPitch(self, pitch):
if not self.isInitialized: if not self._isInitialized:
return False return False
return es.set_parameter(espeak.Parameter.Pitch, pitch) return _es.set_parameter(espeak.Parameter.Pitch, pitch)
def setSpeed(self, speed): def setSpeed(self, speed):
if not self.isInitialized: if not self._isInitialized:
return False return False
return es.set_parameter(espeak.Parameter.Rate, speed) return _es.set_parameter(espeak.Parameter.Rate, speed)
def setModule(self, module): def setModule(self, module):
pass pass

40
src/speech/sd.py
View File

@ -3,67 +3,67 @@
# speech-dispatcher driver # speech-dispatcher driver
class speech(): class speech():
def __init__(self, ): def __init__(self ):
self.sd = None self._sd = None
self.isInitialized = False self._isInitialized = False
try: try:
import speechd import speechd
self.sd = speechd.SSIPClient('fenrir') self._sd = speechd.SSIPClient('fenrir')
self.isInitialized = True self._isInitialized = True
except: except:
self.initialized = False self._initialized = False
def speak(self,text, queueable=True): def speak(self,text, queueable=True):
if not self.isInitialized: if not self._isInitialized:
return False return False
if queueable == False: self.cancel() if queueable == False: self.cancel()
self.sd.speak(text) self._sd.speak(text)
return True return True
def cancel(self): def cancel(self):
if not self.isInitialized: if not self._isInitialized:
return False return False
self.sd.cancel() self._sd.cancel()
return True return True
def clear_buffer(self): def clear_buffer(self):
if not self.isInitialized: if not self._isInitialized:
return False return False
return True return True
def setVoice(self, voice): def setVoice(self, voice):
if not self.isInitialized: if not self._isInitialized:
return False return False
try: try:
self.sd.set_voice(voice) self._sd.set_voice(voice)
return True return True
except: except:
return False return False
def setPitch(self, pitch): def setPitch(self, pitch):
if not self.isInitialized: if not self._isInitialized:
return False return False
try: try:
self.sd.set_pitch(pitch) self._sd.set_pitch(pitch)
return True return True
except: except:
return False return False
def setSpeed(self, speed): def setSpeed(self, speed):
if not self.isInitialized: if not self._isInitialized:
return False return False
try: try:
self.sd.set_rate(speed) self._sd.set_rate(speed)
return True return True
except: except:
return False return False
def setModule(self, module): def setModule(self, module):
if not self.isInitialized: if not self._isInitialized:
return False return False
try: try:
self.sd.set_output_module(module) self._sd.set_output_module(module)
return True return True
except: except:
return False return False
@ -71,4 +71,4 @@ class speech():
def shutdown(self): def shutdown(self):
self.cancel() self.cancel()
self.sd.close() self._sd.close()