andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1122 from jodal/feature/config-in-core

Browse Source 
core: Get access to config
This commit is contained in:
Thomas Adamcik 2015-04-09 15:00:40 +02:00
commit 512e51fba2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mopidy/commands.py
View File

@ -278,7 +278,7 @@ class RootCommand(Command):
mixer = self.start_mixer(config, mixer_class) mixer = self.start_mixer(config, mixer_class)
audio = self.start_audio(config, mixer) audio = self.start_audio(config, mixer)
backends = self.start_backends(config, backend_classes, audio) backends = self.start_backends(config, backend_classes, audio)
core = self.start_core(mixer, backends, audio) core = self.start_core(config, mixer, backends, audio)
self.start_frontends(config, frontend_classes, core) self.start_frontends(config, frontend_classes, core)
loop.run() loop.run()
except (exceptions.BackendError, except (exceptions.BackendError,
@ -365,9 +365,10 @@ class RootCommand(Command):
return backends return backends
def start_core(self, mixer, backends, audio): def start_core(self, config, mixer, backends, audio):
logger.info('Starting Mopidy core') logger.info('Starting Mopidy core')
return Core.start(mixer=mixer, backends=backends, audio=audio).proxy() return Core.start(
config=config, mixer=mixer, backends=backends, audio=audio).proxy()
def start_frontends(self, config, frontend_classes, core): def start_frontends(self, config, frontend_classes, core):
logger.info( logger.info(

4
mopidy/core/actor.py
View File

@ -46,9 +46,11 @@ class Core(
"""The tracklist controller. An instance of """The tracklist controller. An instance of
:class:`mopidy.core.TracklistController`.""" :class:`mopidy.core.TracklistController`."""
def __init__(self, mixer=None, backends=None, audio=None): def __init__(self, config=None, mixer=None, backends=None, audio=None):
super(Core, self).__init__() super(Core, self).__init__()
self._config = config
self.backends = Backends(backends) self.backends = Backends(backends)
self.library = LibraryController(backends=self.backends, core=self) self.library = LibraryController(backends=self.backends, core=self)