Merge branch 'v1.0.x' into develop

docs/changelog.rst

@@ -51,6 +51,17 @@ Internal changes
   :issue:`1115`)
 
 
+v1.0.4 (2015-04-30)
+===================
+
+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)
 ===================
 
@@ -62,7 +73,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`)
 
 
@@ -76,7 +87,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`)

mopidy/__init__.py

@@ -14,4 +14,4 @@ if not (2, 7) <= sys.version_info < (3,):
 warnings.filterwarnings('ignore', 'could not open display')
 
 
-__version__ = '1.0.3'
+__version__ = '1.0.4'

mopidy/audio/actor.py

@@ -166,11 +166,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)

tests/test_version.py

@@ -59,5 +59,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('1.0.2', '1.0.3')
-        self.assertVersionLess(__version__, '1.0.4')
+        self.assertVersionLess('1.0.3', __version__)
+        self.assertVersionLess(__version__, '1.0.5')