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

main: Start/stop the selected mixer

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-07-07 21:03:57 +02:00
parent 50d008ae6a
commit 4f53521fea
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mopidy/commands.py
View File

@ -261,13 +261,15 @@ class RootCommand(Command):
def run(self, args, config): def run(self, args, config):
loop = gobject.MainLoop() loop = gobject.MainLoop()
mixer_classes = args.registry['mixer']
backend_classes = args.registry['backend'] backend_classes = args.registry['backend']
frontend_classes = args.registry['frontend'] frontend_classes = args.registry['frontend']
try: try:
audio = self.start_audio(config) audio = self.start_audio(config)
mixer = self.start_mixer(config, audio, mixer_classes)
backends = self.start_backends(config, backend_classes, audio) backends = self.start_backends(config, backend_classes, audio)
core = self.start_core(audio, backends) core = self.start_core(audio, mixer, backends)
self.start_frontends(config, frontend_classes, core) self.start_frontends(config, frontend_classes, core)
loop.run() loop.run()
except KeyboardInterrupt: except KeyboardInterrupt:
@ -277,6 +279,7 @@ class RootCommand(Command):
loop.quit() loop.quit()
self.stop_frontends(frontend_classes) self.stop_frontends(frontend_classes)
self.stop_core() self.stop_core()
self.stop_mixer(mixer_classes)
self.stop_backends(backend_classes) self.stop_backends(backend_classes)
self.stop_audio() self.stop_audio()
process.stop_remaining_actors() process.stop_remaining_actors()
@ -297,7 +300,23 @@ class RootCommand(Command):
return backends return backends
def start_core(self, audio, backends): def start_mixer(self, config, audio, mixer_classes):
logger.debug(
'Available Mopidy mixers: %s',
', '.join(m.__name__ for m in mixer_classes) or 'none')
selected_mixers = [
m for m in mixer_classes if m.name == config['audio']['mixer']]
if len(selected_mixers) != 1:
logger.error(
'Did not find unique mixer "%s". Alternatives are: %s',
config['audio']['mixer'],
', '.join([m.name for m in mixer_classes]))
process.exit_process()
mixer_class = selected_mixers[0]
logger.info('Starting Mopidy mixer: %s', mixer_class.__name__)
return mixer_class.start(config=config, audio=audio).proxy()
def start_core(self, audio, mixer, backends):
logger.info('Starting Mopidy core') logger.info('Starting Mopidy core')
return Core.start(audio=audio, backends=backends).proxy() return Core.start(audio=audio, backends=backends).proxy()
@ -318,6 +337,11 @@ class RootCommand(Command):
logger.info('Stopping Mopidy core') logger.info('Stopping Mopidy core')
process.stop_actors_by_class(Core) process.stop_actors_by_class(Core)
def stop_mixer(self, mixer_classes):
logger.info('Stopping Mopidy mixer')
for mixer_class in mixer_classes:
process.stop_actors_by_class(mixer_class)
def stop_backends(self, backend_classes): def stop_backends(self, backend_classes):
logger.info('Stopping Mopidy backends') logger.info('Stopping Mopidy backends')
for backend_class in backend_classes: for backend_class in backend_classes: