diff --git a/mopidy/commands.py b/mopidy/commands.py index e00fca3f..2414348b 100644 --- a/mopidy/commands.py +++ b/mopidy/commands.py @@ -278,7 +278,7 @@ class RootCommand(Command): mixer = self.start_mixer(config, mixer_class) audio = self.start_audio(config, mixer) 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) loop.run() except (exceptions.BackendError, @@ -365,9 +365,10 @@ class RootCommand(Command): return backends - def start_core(self, mixer, backends, audio): + def start_core(self, config, mixer, backends, audio): 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): logger.info( diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py index 475a8cb8..d2454f64 100644 --- a/mopidy/core/actor.py +++ b/mopidy/core/actor.py @@ -46,9 +46,11 @@ class Core( """The tracklist controller. An instance of :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__() + self._config = config + self.backends = Backends(backends) self.library = LibraryController(backends=self.backends, core=self)