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

mixer: Use initial volume from audio/mixer_volume

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-07-08 01:18:38 +02:00
parent 6d6bc4b808
commit 93ffde39c2
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mopidy/commands.py
View File

@ -304,6 +304,7 @@ class RootCommand(Command):
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:
@ -313,8 +314,18 @@ class RootCommand(Command):
', '.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()
mixer = mixer_class.start(config=config, audio=audio).proxy()
volume = config['audio']['mixer_volume']
if volume is not None:
mixer.set_volume(volume)
logger.info('Mixer volume set to %d', volume)
else:
logger.debug('Mixer volume left unchanged')
return mixer
def start_core(self, mixer, backends):
logger.info('Starting Mopidy core')