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

core: Remove test-only code paths in MixerController

Browse Source
This commit is contained in:
Stein Magnus Jodal 2015-02-13 00:58:52 +01:00
parent 160afbcd26
commit f7e218b72a
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mopidy/core/mixer.py
View File

@ -21,11 +21,8 @@ class MixerController(object):
The volume scale is linear.
"""
if self._mixer:
if self._mixer is not None:
return self._mixer.get_volume().get()
else:
# For testing
return self._volume
def set_volume(self, volume):
"""Set the volume.
@ -34,31 +31,22 @@ class MixerController(object):
The volume scale is linear.
"""
if self._mixer:
if self._mixer is not None:
self._mixer.set_volume(volume)
else:
# For testing
self._volume = volume
def get_mute(self):
"""Get mute state.
:class:`True` if muted, :class:`False` otherwise.
:class:`True` if muted, :class:`False` unmuted, :class:`None` if
unknown.
"""
if self._mixer:
if self._mixer is not None:
return self._mixer.get_mute().get()
else:
# For testing
return self._mute
def set_mute(self, mute):
"""Set mute state.
:class:`True` to mute, :class:`False` to unmute.
"""
mute = bool(mute)
if self._mixer:
self._mixer.set_mute(mute)
else:
# For testing
self._mute = mute
if self._mixer is not None:
self._mixer.set_mute(bool(mute))