From 5894e7afe03d92bee416040f2b1586126ee87674 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Fri, 5 Apr 2013 15:41:59 +0200 Subject: [PATCH] stream: Use new config system --- mopidy/backends/stream/__init__.py | 5 ++--- mopidy/backends/stream/actor.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mopidy/backends/stream/__init__.py b/mopidy/backends/stream/__init__.py index 9a393bed..17b85d33 100644 --- a/mopidy/backends/stream/__init__.py +++ b/mopidy/backends/stream/__init__.py @@ -23,9 +23,8 @@ protocols = __doc__ = """A backend for playing music for streaming music. -This backend will handle streaming of URIs in -:attr:`mopidy.settings.STREAM_PROTOCOLS` assuming the right plugins are -installed. +This backend will handle streaming of URIs matching the ``stream/protocols`` +config value, assuming the needed GStreamer plugins are installed. **Issues** diff --git a/mopidy/backends/stream/actor.py b/mopidy/backends/stream/actor.py index d6eb31d3..86df447d 100644 --- a/mopidy/backends/stream/actor.py +++ b/mopidy/backends/stream/actor.py @@ -5,7 +5,7 @@ import urlparse import pykka -from mopidy import audio as audio_lib, settings +from mopidy import audio as audio_lib from mopidy.backends import base from mopidy.models import Track @@ -21,7 +21,7 @@ class StreamBackend(pykka.ThreadingActor, base.Backend): self.playlists = None self.uri_schemes = audio_lib.supported_uri_schemes( - settings.STREAM_PROTOCOLS) + config['stream']['protocols']) # TODO: Should we consider letting lookup know how to expand common playlist