Merge pull request #1152 from adamcik/v1.0.x

v1.0.x fixes for #1146 and #1147

docs/changelog.rst

@@ -12,6 +12,13 @@ Bug fix release.
 - HTTP: Make event broadcasts work with Tornado 2.3, the previous threading fix
   broke this.
 
+- Audio: Fix for :issue:`1097` tuned down the buffer size in the queue. Turns
+  out this can cause distortions in certain cases. Give this an other go with
+  a more generous buffer size. (Fixes: :issue:`1147`)
+
+- Audio: Make sure mute events get emitted by software mixer.
+  (Fixes: :issue:`1146`)
+
 
 v1.0.1 (2015-04-23)
 ===================

mopidy/audio/actor.py

@@ -164,7 +164,7 @@ class _Outputs(gst.Bin):
         # All tee branches need a queue in front of them.
         # But keep the queue short so the volume change isn't to slow:
         queue = gst.element_factory_make('queue')
-        queue.set_property('max-size-buffers', 5)
+        queue.set_property('max-size-buffers', 15)
         self.add(element)
         self.add(queue)
         queue.link(element)
@@ -194,16 +194,14 @@ class SoftwareMixer(object):
 
     def set_volume(self, volume):
         self._element.set_property('volume', volume / 100.0)
-        self._mixer.trigger_volume_changed(volume)
+        self._mixer.trigger_volume_changed(self.get_volume())
 
     def get_mute(self):
         return self._element.get_property('mute')
 
     def set_mute(self, mute):
-        result = self._element.set_property('mute', bool(mute))
-        if result:
-            self._mixer.trigger_mute_changed(bool(mute))
-        return result
+        self._element.set_property('mute', bool(mute))
+        self._mixer.trigger_mute_changed(self.get_mute())
 
 
 class _Handler(object):

tests/mpd/protocol/test_regression.py

@@ -197,7 +197,7 @@ class IssueGH1120RegressionTest(protocol.BaseTestCase):
             'dummy:/': [Ref.playlist(name='Top 100 tracks', uri='dummy:/1')],
         }
         self.backend.playlists.set_dummy_playlists([
-            Playlist(name='Top 100 tracks', uri='dummy:/1'),
+            Playlist(name='Top 100 tracks', uri='dummy:/1', last_modified=123),
         ])
 
         response1 = self.send_request('lsinfo "/"')