reorganize player, prefer mpg123 to play local mp3

avs/interface/alerts.py

@@ -9,7 +9,11 @@
 from threading import Timer, Event
 import uuid
 
-from avs.player import Player
+# prefer mpg123 player as it is more responsive than mpv and gstreamer
+if os.system('which mpg123') == 0:
+    from avs.player.mpg123_player import Player
+else:
+    from avs.player import Player
 
 
 class Alerts(object):

avs/interface/audio_player.py

@@ -176,6 +176,7 @@ def PlaybackStutterFinished(self):
 
     def PlaybackFinished(self):
         self.state = 'FINISHED'
+        logger.info('playback is finished')
 
         event = {
             "header": {

avs/interface/speech_synthesizer.py

@@ -6,7 +6,11 @@
 import hashlib
 import logging
 
-from avs.player import Player
+# prefer mpg123 player as it is more responsive than mpv and gstreamer
+if os.system('which mpg123') == 0:
+    from avs.player.mpg123_player import Player
+else:
+    from avs.player import Player
 
 logger = logging.getLogger('SpeechSynthesizer')
 

avs/player.py → avs/player/__init__.py

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-"""Player"""
+"""Player
+support mpv, mpg123 and gstreamer 1.0
+It prefers mpv if it is available, otherwise use gstreamer 1.0
+We can specify a player using environment variable PLAYER (mpv, mpg123, gstreamer, single_gstreamer)
+"""
 
 import os
 
@@ -12,11 +16,14 @@
     from mpg123_player import Player
 elif player_option.find('single') >= 0:
     from single_gstreamer_player import Player
-else:
+elif player_option.find('gstreamer') >= 0:
     from gstreamer_player import Player
+else:
+    if os.system('which mpv') == 0:
+        from mpv_player import Player
+    else:
+        from gstreamer_player import Player
 
 
 __all__ = ['Player']
 
-
-

avs/mpg123_player.py → avs/player/mpg123_player.py

@@ -7,6 +7,8 @@
 import threading
 import subprocess
 
+if os.system('which mpg123') != 0:
+    ImportError('mpg123 not found, install it first')
 
 class Player(object):
     def __init__(self):

avs/mpv_player.py → avs/player/mpv_player.py

@@ -7,6 +7,9 @@
 import threading
 import subprocess
 
+if os.system('which mpv') != 0:
+    raise ImportError('mpv not found, install it first')
+
 
 class Player(object):
     def __init__(self):

setup.py

@@ -5,11 +5,10 @@
 
 from setuptools import setup, find_packages
 
-with open('README.rst') as readme_file:
-    readme = readme_file.read()
 
-with open('HISTORY.rst') as history_file:
-    history = history_file.read()
+with open('README.md') as f:
+    long_description = f.read()
+
 
 requirements = [
     'click',
@@ -29,9 +28,10 @@
 
 setup(
     name='avs',
-    version='0.1.1',
+    version='0.2.0',
     description="Python implementation of Alexa Voice Service App",
-    long_description=readme + '\n\n' + history,
+    long_description=long_description,
+    long_description_content_type='text/markdown',
     author="Yihui Xiong",
     author_email='[email protected]',
     url='https://github.com/respeaker/avs',