Add configuration options

mycroft/skills/playback_control/__init__.py

@@ -27,7 +27,7 @@ if config.get('audio.vlc', 'False') == 'True':
 
 
 class Mpg123Service():
-    def __init__(self, emitter):
+    def __init__(self, config, emitter):
         self.process = None
         self.emitter = emitter 
         self.emitter.on('Mpg123ServicePlay', self._play)
@@ -101,12 +101,12 @@ class PlaybackControlSkill(MediaSkill):
 
         if config.get('audio.vlc', 'False') == 'True':
             logger.info('starting VLC service')
-            self.service.append(VlcService(self.emitter))
+            self.service.append(VlcService(config, self.emitter))
         if config.get('audio.mopidy', 'False') == 'True':
             logger.info('starting Mopidy service')
-            self.service.append(MopidyService(self.emitter))
+            self.service.append(MopidyService(config, self.emitter))
         logger.info('starting Mpg123 service')
-        self.service.append(Mpg123Service(self.emitter))
+        self.service.append(Mpg123Service(config, self.emitter))
         self.emitter.on('MycroftAudioServicePlay', self._play)
         self.emitter.on('MycroftAudioServiceTrackInfo', self._track_info)
 

mycroft/skills/playback_control/mopidy_service.py

@@ -14,6 +14,8 @@ class MopidyService():
     def _connect(self, message):
         logger.debug('Could not connect to server, will retry quietly')
         url = 'http://localhost:6680'
+        if self.config is not None:
+            url = self.config.get('audio.mopidy.server', url)
         try:
             self.mopidy = Mopidy(url)
         except:
@@ -26,15 +28,25 @@ class MopidyService():
 
         logger.info('Connected to mopidy server')
     
-    def __init__(self, emitter):
+    def __init__(self, config, emitter):
         self.connection_attempts = 0
         self.emitter = emitter 
+        self.config = config
+
+        self.mopidy = None
         self.emitter.on('MopidyServiceConnect', self._connect)
         self._connect(None)
 
+    @property
+    def name(self):
+        return self.config.get('audio.mopidy.name', 'mopidy')
+
     def supported_uris(self):
-        return ['file', 'http', 'https', 'local', 'spotify', 'gmusic']
-    
+        if self.mopidy:
+            return ['file', 'http', 'https', 'local', 'spotify', 'gmusic']
+        else:
+            return []
+
     def clear_list(self):
         self.mopidy.clear_list()
     

mycroft/skills/playback_control/vlc_service.py

@@ -6,12 +6,13 @@ logger = getLogger(abspath(__file__).split('/')[-2])
 import vlc
 
 class VlcService():
-    def __init__(self, emitter):
+    def __init__(self, config, emitter=None):
         self.instance = vlc.Instance()
         self.list_player = self.instance.media_list_player_new()
         self.player = self.instance.media_player_new()
         self.list_player.set_media_player(self.player)
 
+        self.config = config
         self.emitter = emitter 
     
     def supported_uris(self):
@@ -51,7 +52,7 @@ class VlcService():
 
     def lower_volume(self):
         self.player.audio_set_volume(30)
-        
+
     def restore_volume(self):
         self.player.audio_set_volume(100)