Skip to content
This repository was archived by the owner on Sep 8, 2024. It is now read-only.

Check queue empty with self.queue.empty() instead of len() #894

Merged
merged 3 commits into from
Jul 7, 2017
Merged

Check queue empty with self.queue.empty() instead of len() #894

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4eaacf7
Check queue empty with self.queue.empty() instead of len()
forslund Jul 7, 2017
0223986
Add error logging of exceptions in tts thread.
forslund Jul 7, 2017
78203a1
Limit the number of audio_output_start messages.
forslund Jul 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions mycroft/tts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from abc import ABCMeta, abstractmethod
from os.path import dirname, exists, isdir
from threading import Thread
from Queue import Queue
from Queue import Queue, Empty
from time import time, sleep
import os
import os.path
Expand Down Expand Up @@ -46,6 +46,7 @@ def __init__(self, queue):
super(PlaybackThread, self).__init__()
self.queue = queue
self._terminated = False
self._processing_queue = False

def init(self, tts):
self.tts = tts
Expand All @@ -70,7 +71,10 @@ def run(self):
try:
snd_type, data, visimes = self.queue.get(timeout=2)
self.blink(0.5)
self.tts.begin_audio()
if not self._processing_queue:
self._processing_queue = True
self.tts.begin_audio()

if snd_type == 'wav':
self.p = play_wav(data)
elif snd_type == 'mp3':
Expand All @@ -82,11 +86,18 @@ def run(self):
else:
self.p.communicate()
self.p.wait()
if len(self.queue) == 0:

if self.queue.empty():
self.tts.end_audio()
self._processing_queue = False
self.blink(0.2)
except:
except Empty:
pass
except Exception, e:
LOGGER.exception(e)
if self._processing_queue:
self.tts.end_audio()
self._processing_queue = False

def show_visimes(self, pairs):
"""
Expand Down