From df4c5d8bcb311b88f0d1031c67c3a265b3706c49 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Mon, 28 Jul 2014 23:41:17 +0200 Subject: [PATCH 1/9] tox: Fix Tornado version mismatch in env name and deps (cherry picked from commit acef38a6c75bb46324d4a49b57552f2320f02694) --- tox.ini | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index 93447015..ed6f0271 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = tornado2.3, tornado3.2, py27, docs, flake8 +envlist = py27, py27-tornado23, py27-tornado31, docs, flake8 [testenv] sitepackages = true @@ -9,14 +9,16 @@ deps = mock nose -[testenv:tornado2.3] +[testenv:py27-tornado23] commands = nosetests -v tests/http -deps = {[testenv]deps} +deps = + {[testenv]deps} tornado==2.3 -[testenv:tornado3.2] +[testenv:py27-tornado31] commands = nosetests -v tests/http -deps = {[testenv]deps} +deps = + {[testenv]deps} tornado==3.1 [testenv:docs] From 4cb858771f334039d05fc4c0925f0fe95840aea0 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 29 Jul 2014 23:15:05 +0200 Subject: [PATCH 2/9] travis: Update tox env names (cherry picked from commit e950cf5501bf82787e202024774a4e5f6f85ed27) --- .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 1b8feefcdc3215f57f3ba982b5abe807cbe4a0fd Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Tue, 29 Jul 2014 23:45:22 +0200 Subject: [PATCH 3/9] audio: Link to context of why we demote jack sinks (cherry picked from commit 29019d94af42e81b478dd283a70c809f78e5f650) --- 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 2b758195056f1cad6ab8827e52838969971395bd Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Tue, 29 Jul 2014 23:47:23 +0200 Subject: [PATCH 4/9] doc: Add changelog entry for jack sink fix (cherry picked from commit 0440703abbe8a96eb45a1795fdca2482f7998b9d) Conflicts: docs/changelog.rst --- docs/changelog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index ac8084d3..3502425a 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -13,6 +13,8 @@ Bug fix release. - Audio: Fix negative track length for radio streams. (Fixes: :issue:`662`, PR: :issue:`796`) +- Audio: Tell GStreamer to not pick Jack sink. (Fixes: :issue:`604`) + - Zeroconf: Fix discovery by adding ``.local`` to the announced hostname. (PR: :issue:`795`) From 2c04d97eaf510f1b67dc70236f99c57c14c9f154 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 29 Jul 2014 23:46:16 +0200 Subject: [PATCH 5/9] docs: Update authors (cherry picked from commit 614dc93ad85e58be563f3cb7cfb4ffa3c951b202) --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 7a20f492..e36d953d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -41,3 +41,4 @@ - Thomas Scholtes - Sam Willcocks - Ignasi Fosch +- Arjun Naik From 24db560fd054b0c549d4652b54242d46582d6bbe Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 29 Jul 2014 23:41:59 +0200 Subject: [PATCH 6/9] docs: Add Mopidy-Banshee (cherry picked from commit a470e0c9147d528fa09a1fedccfe0f9f507bc433) --- docs/ext/backends.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/ext/backends.rst b/docs/ext/backends.rst index 1b0bf112..c4074a12 100644 --- a/docs/ext/backends.rst +++ b/docs/ext/backends.rst @@ -11,6 +11,15 @@ This list is moderated and updated on a regular basis. If you want your package to show up here, follow the :ref:`guide on creating extensions `. +Mopidy-Banshee +============== + +https://github.com/tamland/mopidy-banshee + +Provides a backend for playing music from the `Banshee `_ +music player's music library. + + Mopidy-Beets ============ From 195b78a50b2a2cc5ebb4b3e4e075e47c7c5ff21e Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 29 Jul 2014 23:43:57 +0200 Subject: [PATCH 7/9] docs: Add Mopidy-Bassdrive (cherry picked from commit c51988546da16fdb1017c7411fd26b70f783e4d4) --- docs/ext/backends.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/ext/backends.rst b/docs/ext/backends.rst index c4074a12..06f6244c 100644 --- a/docs/ext/backends.rst +++ b/docs/ext/backends.rst @@ -20,6 +20,15 @@ Provides a backend for playing music from the `Banshee `_ music player's music library. +Mopidy-Bassdrive +================ + +https://github.com/felixb/mopidy-Bassdrive + +Provides a backend for playing radio streams from `BassDrive +`_. + + Mopidy-Beets ============ From 6c684e1cbed7c177575ebf1d2cd0e708b64c0edf Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 30 Jul 2014 00:24:28 +0200 Subject: [PATCH 8/9] docs: Add Mopidy-LeftAsRain (cherry picked from commit 2a28128c37732f07e6ddaa1cd712949cbad49245) --- docs/ext/backends.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/ext/backends.rst b/docs/ext/backends.rst index 06f6244c..2b516f55 100644 --- a/docs/ext/backends.rst +++ b/docs/ext/backends.rst @@ -65,6 +65,15 @@ Extension for playing music and audio from the `Internet Archive `_. +Mopidy-LeftAsRain +================= + +https://github.com/naglis/mopidy-leftasrain + +Extension for playing music from the `leftasrain.com +`_ music blog. + + Mopidy-Local ============ From 3a442483eb209e137d4ba32101898305f2592743 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 30 Jul 2014 00:27:26 +0200 Subject: [PATCH 9/9] docs: Add Mopidy-Touchscreen (cherry picked from commit 27d4c89ae98c8cf64fc3da355050c180d35ac232) --- docs/ext/frontends.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/ext/frontends.rst b/docs/ext/frontends.rst index 481ac510..1010b1f6 100644 --- a/docs/ext/frontends.rst +++ b/docs/ext/frontends.rst @@ -47,3 +47,12 @@ Mopidy-Scrobbler https://github.com/mopidy/mopidy-scrobbler Extension for scrobbling played tracks to Last.fm. + + +Mopidy-Touchscreen +================== + +https://github.com/9and3r/mopidy-touchscreen + +Extension for displaying track info and controlling Mopidy from a touch screen +using `PyGame `_/SDL.