From b58436aaf3b09a56bfe17df171a579188d98b8c4 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sun, 24 Apr 2011 03:03:43 +0200 Subject: [PATCH] Use audioconvert to ensure that volume element is handeled --- mopidy/outputs/gstreamer.py | 2 +- tests/outputs/gstreamer_test.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mopidy/outputs/gstreamer.py b/mopidy/outputs/gstreamer.py index 984efef1..9430f47c 100644 --- a/mopidy/outputs/gstreamer.py +++ b/mopidy/outputs/gstreamer.py @@ -79,7 +79,7 @@ class GStreamerOutput(ThreadingActor, BaseOutput): if not settings.SHOUTCAST_SERVER: return None - description = ['%s ! shout2send' % settings.SHOUTCAST_ENCODER] + description = ['audioconvert ! %s ! shout2send' % settings.SHOUTCAST_ENCODER] options = { u'ip': settings.SHOUTCAST_SERVER, u'mount': settings.SHOUTCAST_MOUNT, diff --git a/tests/outputs/gstreamer_test.py b/tests/outputs/gstreamer_test.py index b39e5583..14493665 100644 --- a/tests/outputs/gstreamer_test.py +++ b/tests/outputs/gstreamer_test.py @@ -67,7 +67,7 @@ class GStreamerOutputTest(unittest.TestCase): def test_build_shoutcast_description_with_server(self): settings.SHOUTCAST_SERVER = '127.0.0.1' - expected = u'%s ! ' % settings.SHOUTCAST_ENCODER + \ + expected = u'audioconvert ! %s ! ' % settings.SHOUTCAST_ENCODER + \ u'shout2send ip="127.0.0.1" mount="/stream" ' \ u'password="hackme" port="8000" username="source"' result = self.output._build_shoutcast_description() @@ -77,7 +77,7 @@ class GStreamerOutputTest(unittest.TestCase): settings.SHOUTCAST_SERVER = '127.0.0.1' settings.SHOUTCAST_MOUNT = '/stream.mp3' - expected = u'%s ! ' % settings.SHOUTCAST_ENCODER + \ + expected = u'audioconvert ! %s ! ' % settings.SHOUTCAST_ENCODER + \ u'shout2send ip="127.0.0.1" mount="/stream.mp3" ' \ u'password="hackme" port="8000" username="source"' result = self.output._build_shoutcast_description() @@ -88,7 +88,7 @@ class GStreamerOutputTest(unittest.TestCase): settings.SHOUTCAST_USER = 'john' settings.SHOUTCAST_PASSWORD = 'doe' - expected = u'%s ! ' % settings.SHOUTCAST_ENCODER + \ + expected = u'audioconvert ! %s ! ' % settings.SHOUTCAST_ENCODER + \ u'shout2send ip="127.0.0.1" mount="/stream" ' \ u'password="doe" port="8000" username="john"' result = self.output._build_shoutcast_description() @@ -99,7 +99,7 @@ class GStreamerOutputTest(unittest.TestCase): settings.SHOUTCAST_USER = None settings.SHOUTCAST_PASSWORD = None - expected = u'%s ! shout2send ' % settings.SHOUTCAST_ENCODER + \ + expected = u'audioconvert ! %s ! shout2send ' % settings.SHOUTCAST_ENCODER + \ u'ip="127.0.0.1" mount="/stream" port="8000"' result = self.output._build_shoutcast_description() self.assertEqual(expected, result)