From 7938ef48eddb55bd0865bd0df48b5b9d99cc338a Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Wed, 29 Apr 2015 21:27:57 +0200 Subject: [PATCH 1/3] audio: Stop tweaking tee queue sizes --- docs/changelog.rst | 14 ++++++++++++-- mopidy/audio/actor.py | 4 ---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index d51b4bf1..f7b7beb4 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,6 +4,16 @@ Changelog This changelog is used to track all major changes to Mopidy. +v1.0.4 (unreleased) +=================== + +Bug fix release. + +- Audio: Since all previous attempts at tweaking the queuing for :issue:`1097` + seems to break things in subtle ways for different users. We are giving up + on tweaking the defaults and just going to live with a bit more lag on + software volume changes. (Fixes: :issue:`1147`) + v1.0.3 (2015-04-28) =================== @@ -16,7 +26,7 @@ Bug fix release. - Audio: Follow-up fix for :issue:`1097` still exhibits issues for certain setups. We are giving this get an other go by setting the buffer size to - maximum 100ms instead of a fixed number of buffers. (Fixes: :issue:`1147`, + maximum 100ms instead of a fixed number of buffers. (Addresses: :issue:`1147`, PR: :issue:`1154`) @@ -30,7 +40,7 @@ Bug fix release. - 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`, PR: :issue:`1152`) + a more generous buffer size. (Addresses: :issue:`1147`, PR: :issue:`1152`) - Audio: Make sure mute events get emitted by software mixer. (Fixes: :issue:`1146`, PR: :issue:`1152`) diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index 7cca954a..fcd1e233 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -161,11 +161,7 @@ class _Outputs(gst.Bin): logger.info('Audio output set to "%s"', description) def _add(self, element): - # 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-time', 100 * gst.MSECOND) - self.add(element) self.add(queue) queue.link(element) From b1475f7d060b60f0794dbc90f9aae10e0657ec04 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 30 Apr 2015 08:40:13 +0200 Subject: [PATCH 2/3] docs: Update changelog for v1.0.4 --- docs/changelog.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index f7b7beb4..10c413ec 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,7 +4,8 @@ Changelog This changelog is used to track all major changes to Mopidy. -v1.0.4 (unreleased) + +v1.0.4 (2015-04-30) =================== Bug fix release. From 2f96dacae82a4a903dfac761a8c9a4307812efee Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 30 Apr 2015 08:41:03 +0200 Subject: [PATCH 3/3] Bump version to 1.0.4 --- mopidy/__init__.py | 2 +- tests/test_version.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mopidy/__init__.py b/mopidy/__init__.py index c2823270..0bc5410e 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -30,4 +30,4 @@ except ImportError: warnings.filterwarnings('ignore', 'could not open display') -__version__ = '1.0.3' +__version__ = '1.0.4' diff --git a/tests/test_version.py b/tests/test_version.py index 1bdcfe01..37d0b459 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -58,5 +58,6 @@ class VersionTest(unittest.TestCase): self.assertVersionLess('0.19.5', '1.0.0') self.assertVersionLess('1.0.0', '1.0.1') self.assertVersionLess('1.0.1', '1.0.2') - self.assertVersionLess('1.0.2', __version__) - self.assertVersionLess(__version__, '1.0.4') + self.assertVersionLess('1.0.2', '1.0.3') + self.assertVersionLess('1.0.3', __version__) + self.assertVersionLess(__version__, '1.0.5')