From b80361ccb2fd2bb3e1f6b3132b2e0d848d54c6d9 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sun, 26 Apr 2015 23:07:10 +0200 Subject: [PATCH 1/3] audio: Increase per tee branch buffer size. Fixes #1147 --- docs/changelog.rst | 4 ++++ mopidy/audio/actor.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 123ca456..7dd2101a 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -12,6 +12,10 @@ 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`) + v1.0.1 (2015-04-23) =================== diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index e0a7892a..3198c006 100644 --- a/mopidy/audio/actor.py +++ b/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) From e53bf561155b0aefb945bc00cc0060285f2850ca Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sun, 26 Apr 2015 23:15:03 +0200 Subject: [PATCH 2/3] audio: Make sure software mixer emits mute events. Turns out that gobject.GObject.set_property does not have a return value. --- docs/changelog.rst | 3 +++ mopidy/audio/actor.py | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 7dd2101a..e10165ac 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -16,6 +16,9 @@ Bug fix release. 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) =================== diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index 3198c006..45ad73ff 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -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): From 651e89357f2b46285088d8bbfb47b4220d9124e5 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Fri, 24 Apr 2015 19:26:02 +0200 Subject: [PATCH 3/3] tests: Fix IssueGH1120RegressionTest flakiness --- tests/mpd/protocol/test_regression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/mpd/protocol/test_regression.py b/tests/mpd/protocol/test_regression.py index 60a71ee8..a31258ab 100644 --- a/tests/mpd/protocol/test_regression.py +++ b/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 "/"')