Merge branch 'master' of github.com:chrys87/fenrir
This commit is contained in:
commit
7d664004f1
@ -37,7 +37,7 @@ class driver(soundDriver):
|
|||||||
word = word.replace('fenrirFreqDuration', str(duration))
|
word = word.replace('fenrirFreqDuration', str(duration))
|
||||||
word = word.replace('fenrirFrequence', str(frequence))
|
word = word.replace('fenrirFrequence', str(frequence))
|
||||||
popenFrequenceCommand[idx] = word
|
popenFrequenceCommand[idx] = word
|
||||||
self.proc = subprocess.Popen(popenFrequenceCommand, shell=False)
|
self.proc = subprocess.Popen(popenFrequenceCommand, stdin=None, stdout=None, stderr=None, shell=False)
|
||||||
self.soundType = 'frequence'
|
self.soundType = 'frequence'
|
||||||
def playSoundFile(self, filePath, interrupt = True):
|
def playSoundFile(self, filePath, interrupt = True):
|
||||||
if not self._initialized:
|
if not self._initialized:
|
||||||
|
@ -180,7 +180,7 @@ class driver(speechDriver):
|
|||||||
try:
|
try:
|
||||||
self.env['runtime']['debug'].writeDebugOut('speechDriver:worker:' + ' '.join(popenSpeechCommand),debug.debugLevel.INFO)
|
self.env['runtime']['debug'].writeDebugOut('speechDriver:worker:' + ' '.join(popenSpeechCommand),debug.debugLevel.INFO)
|
||||||
self.lock.acquire(True)
|
self.lock.acquire(True)
|
||||||
self.proc = Popen(popenSpeechCommand, shell=False)
|
self.proc = Popen(popenSpeechCommand, stdin=None, stdout=None, stderr=None, shell=False)
|
||||||
self.lock.release()
|
self.lock.release()
|
||||||
self.proc.wait()
|
self.proc.wait()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
Loading…
Reference in New Issue
Block a user