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

mpd: Make code read better

Browse Source 
The result of set_mute() and set_volume() is always True or False, never
another falsy value like None.
This commit is contained in:
Stein Magnus Jodal 2015-03-13 21:20:25 +01:00
parent b29f9e10c4
commit 9adb2c86a9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mopidy/mpd/protocol/audio_output.py
View File

@ -14,7 +14,7 @@ def disableoutput(context, outputid):
""" """
if outputid == 0: if outputid == 0:
success = context.core.mixer.set_mute(False).get() success = context.core.mixer.set_mute(False).get()
if success is False: if not success:
raise exceptions.MpdSystemError('problems disabling output') raise exceptions.MpdSystemError('problems disabling output')
else: else:
raise exceptions.MpdNoExistError('No such audio output') raise exceptions.MpdNoExistError('No such audio output')
@ -31,7 +31,7 @@ def enableoutput(context, outputid):
""" """
if outputid == 0: if outputid == 0:
success = context.core.mixer.set_mute(True).get() success = context.core.mixer.set_mute(True).get()
if success is False: if not success:
raise exceptions.MpdSystemError('problems enabling output') raise exceptions.MpdSystemError('problems enabling output')
else: else:
raise exceptions.MpdNoExistError('No such audio output') raise exceptions.MpdNoExistError('No such audio output')
@ -49,7 +49,7 @@ def toggleoutput(context, outputid):
if outputid == 0: if outputid == 0:
mute_status = context.core.mixer.get_mute().get() mute_status = context.core.mixer.get_mute().get()
success = context.core.mixer.set_mute(not mute_status) success = context.core.mixer.set_mute(not mute_status)
if success is False: if not success:
raise exceptions.MpdSystemError('problems toggling output') raise exceptions.MpdSystemError('problems toggling output')
else: else:
raise exceptions.MpdNoExistError('No such audio output') raise exceptions.MpdNoExistError('No such audio output')

2
mopidy/mpd/protocol/playback.py
View File

@ -397,7 +397,7 @@ def setvol(context, volume):
# NOTE: we use INT as clients can pass in +N etc. # NOTE: we use INT as clients can pass in +N etc.
value = min(max(0, volume), 100) value = min(max(0, volume), 100)
success = context.core.mixer.set_volume(value).get() success = context.core.mixer.set_volume(value).get()
if success is False: if not success:
raise exceptions.MpdSystemError('problems setting volume') raise exceptions.MpdSystemError('problems setting volume')