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

audio: Use None instead of -1 for undefined volume

Browse Source
This commit is contained in:
Trygve Aaberge 2012-12-18 18:18:29 +01:00
parent d3e3bef2c0
commit fcda4696bc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/audio/actor.py
View File

@ -43,7 +43,7 @@ class Audio(pykka.ThreadingActor):
self._mixer_track = None self._mixer_track = None
self._software_mixing = False self._software_mixing = False
self._appsrc = None self._appsrc = None
self._volume_set = -1 self._volume_set = None
self._notify_source_signal_id = None self._notify_source_signal_id = None
self._about_to_finish_id = None self._about_to_finish_id = None
@ -396,7 +396,7 @@ class Audio(pykka.ThreadingActor):
volume_set_scaled = self._rescale( volume_set_scaled = self._rescale(
self._volume_set, old=internal_scale, new=mixer_scale) self._volume_set, old=internal_scale, new=mixer_scale)
if self._volume_set > 0 and volume_set_scaled == avg_volume: if self._volume_set is not None and volume_set_scaled == avg_volume:
return self._volume_set return self._volume_set
else: else:
return self._rescale( return self._rescale(