From 4d5f60fd067b67132364206e4e74e69413417bcc Mon Sep 17 00:00:00 2001 From: Arjun Naik Date: Sun, 27 Jul 2014 11:41:27 +0000 Subject: [PATCH 1/6] Workaround for RasPi selecting jack server. --- mopidy/audio/actor.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index dcc51ea4..f3880210 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -72,6 +72,7 @@ class Audio(pykka.ThreadingActor): def on_start(self): try: + self._setup_preferences() self._setup_playbin() self._setup_output() self._setup_mixer() @@ -96,6 +97,12 @@ class Audio(pykka.ThreadingActor): if signal_id is not None: element.disconnect(signal_id) + def _setup_preferences(self): + registry = gst.registry_get_default() + jacksink = registry.find_feature('jackaudiosink', gst.TYPE_ELEMENT_FACTORY) + if jacksink: + jacksink.set_rank(gst.RANK_SECONDARY) + def _setup_playbin(self): playbin = gst.element_factory_make('playbin2') playbin.set_property('flags', PLAYBIN_FLAGS) From f4777e50c2b51bf10ce402fe351a381e61a35780 Mon Sep 17 00:00:00 2001 From: Arjun Naik Date: Sun, 27 Jul 2014 14:33:34 +0000 Subject: [PATCH 2/6] Fixed long line Flake8 warning. --- mopidy/audio/actor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index f3880210..5b4362a3 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -99,7 +99,8 @@ class Audio(pykka.ThreadingActor): def _setup_preferences(self): registry = gst.registry_get_default() - jacksink = registry.find_feature('jackaudiosink', gst.TYPE_ELEMENT_FACTORY) + jacksink = registry.find_feature( + 'jackaudiosink', gst.TYPE_ELEMENT_FACTORY) if jacksink: jacksink.set_rank(gst.RANK_SECONDARY) From e950cf5501bf82787e202024774a4e5f6f85ed27 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 29 Jul 2014 23:15:05 +0200 Subject: [PATCH 3/6] travis: Update tox env names --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 77a8d8a3..8e14280f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ python: env: - TOX_ENV=py27 - - TOX_ENV=tornado2.3 - - TOX_ENV=tornado3.2 + - TOX_ENV=py27-tornado23 + - TOX_ENV=py27-tornado31 - TOX_ENV=docs - TOX_ENV=flake8 From d9efb1f877e07fb232cb8012575aef4d4c544f47 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 29 Jul 2014 23:34:21 +0200 Subject: [PATCH 4/6] docs: Add v0.20 changelog --- docs/changelog.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index ac8084d3..486ebf8d 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,15 @@ Changelog This changelog is used to track all major changes to Mopidy. +v0.20.0 (UNRELEASED) +==================== + +**Local backend** + +- Add cover URL to all scanned files with MusicBrainz album IDs. (Fixes: + :issue:`697`, PR: :issue:`802`) + + v0.19.3 (UNRELEASED) ==================== From 29019d94af42e81b478dd283a70c809f78e5f650 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Tue, 29 Jul 2014 23:45:22 +0200 Subject: [PATCH 5/6] audio: Link to context of why we demote jack sinks --- mopidy/audio/actor.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index 5b4362a3..0d90394d 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -98,6 +98,7 @@ class Audio(pykka.ThreadingActor): element.disconnect(signal_id) def _setup_preferences(self): + # Fix for https://github.com/mopidy/mopidy/issues/604 registry = gst.registry_get_default() jacksink = registry.find_feature( 'jackaudiosink', gst.TYPE_ELEMENT_FACTORY) From 0440703abbe8a96eb45a1795fdca2482f7998b9d Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Tue, 29 Jul 2014 23:47:23 +0200 Subject: [PATCH 6/6] doc: Add changelog entry for jack sink fix --- docs/changelog.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 486ebf8d..b2d83144 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -12,7 +12,10 @@ v0.20.0 (UNRELEASED) - Add cover URL to all scanned files with MusicBrainz album IDs. (Fixes: :issue:`697`, PR: :issue:`802`) + +**Audio** +- Tell GStreamer to not pick jack sink on raspis (Fixes: :issue:`604`) v0.19.3 (UNRELEASED) ====================