Clean up changes

neon_audio/service.py

@@ -93,10 +93,6 @@ def __init__(self, ready_hook=on_ready, error_hook=on_error,
         PlaybackService.__init__(self, ready_hook, error_hook, stopping_hook,
                                  alive_hook, started_hook, watchdog, bus,
                                  disable_ocp, validate_source=False)
-        del self.playback_thread
-        from neon_audio.tts.neon import NeonPlaybackThread
-        from ovos_plugin_manager.tts import TTS
-        self.playback_thread = NeonPlaybackThread(TTS.queue, self.bus)
         LOG.debug(f'Initialized tts={self._tts_hash} | '
                   f'fallback={self._fallback_tts_hash}')
         create_signal("neon_speak_api")   # Create signal so skills use API

neon_audio/tts/neon.py

@@ -31,7 +31,6 @@
 import os
 
 from os.path import dirname
-from queue import Empty
 from time import time
 from typing import List
 
@@ -174,7 +173,6 @@ def end_audio(self, listen, message=None):
         check_for_signal("isSpeaking")
 
     def _play(self):
-        # TODO Not called?
         LOG.debug(f"Start playing {self._now_playing} from queue={self.queue}")
         # wav_file, vis, listen, ident, message
         ident = self._now_playing[3]
@@ -204,24 +202,6 @@ def resume(self):
         LOG.debug(f"Playback thread resumed")
         PlaybackThread.resume(self)
 
-    def run(self, cb=None):
-        LOG.info("PlaybackThread started")
-        self._do_playback.set()
-        self._started.set()
-        while not self._terminated:
-            self._do_playback.wait()
-            try:
-                data, visemes, listen, tts_id, message = self.queue.get(timeout=2)
-                LOG.debug(f"START PLAYBACK")
-                self._now_playing = (data, visemes, listen, tts_id, message)
-                self._play()
-                assert self._now_playing is None
-                LOG.debug("END PLAYBACK")
-            except Empty:
-                pass
-            except Exception as e:
-                LOG.error(e)
-
 
 class WrappedTTS(TTS):
     def __new__(cls, base_engine, *args, **kwargs):