From 120c3812855580dfbdee30091bacaebc1e9643ba Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 11 Jan 2014 15:10:37 +0100
Subject: [PATCH] stream: Move mopidy.{backends => }.stream

---
 docs/api/backends.rst                    | 2 +-
 docs/changelog.rst                       | 6 +++---
 docs/ext/stream.rst                      | 2 +-
 mopidy/{backends => }/stream/__init__.py | 0
 mopidy/{backends => }/stream/actor.py    | 0
 mopidy/{backends => }/stream/ext.conf    | 0
 setup.py                                 | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename mopidy/{backends => }/stream/__init__.py (100%)
 rename mopidy/{backends => }/stream/actor.py (100%)
 rename mopidy/{backends => }/stream/ext.conf (100%)

diff --git a/docs/api/backends.rst b/docs/api/backends.rst
index ec78f250..2c4ad6a6 100644
--- a/docs/api/backends.rst
+++ b/docs/api/backends.rst
@@ -54,4 +54,4 @@ Backend implementations
 
 * :mod:`mopidy.backends.dummy`
 * :mod:`mopidy.backends.local`
-* :mod:`mopidy.backends.stream`
+* :mod:`mopidy.stream`
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8bd5b15e..97be243b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -708,9 +708,9 @@ throughout Mopidy.
 **Stream backend**
 
 We've added a new backend for playing audio streams, the :mod:`stream backend
-<mopidy.backends.stream>`. It is activated by default. The stream backend
-supports the intersection of what your GStreamer installation supports and what
-protocols are included in the :attr:`mopidy.settings.STREAM_PROTOCOLS` setting.
+<mopidy.stream>`. It is activated by default. The stream backend supports the
+intersection of what your GStreamer installation supports and what protocols
+are included in the :attr:`mopidy.settings.STREAM_PROTOCOLS` setting.
 
 Current limitations:
 
diff --git a/docs/ext/stream.rst b/docs/ext/stream.rst
index 22e7d99e..6c6ab21c 100644
--- a/docs/ext/stream.rst
+++ b/docs/ext/stream.rst
@@ -20,7 +20,7 @@ None. The extension just needs Mopidy.
 Default configuration
 =====================
 
-.. literalinclude:: ../../mopidy/backends/stream/ext.conf
+.. literalinclude:: ../../mopidy/stream/ext.conf
     :language: ini
 
 
diff --git a/mopidy/backends/stream/__init__.py b/mopidy/stream/__init__.py
similarity index 100%
rename from mopidy/backends/stream/__init__.py
rename to mopidy/stream/__init__.py
diff --git a/mopidy/backends/stream/actor.py b/mopidy/stream/actor.py
similarity index 100%
rename from mopidy/backends/stream/actor.py
rename to mopidy/stream/actor.py
diff --git a/mopidy/backends/stream/ext.conf b/mopidy/stream/ext.conf
similarity index 100%
rename from mopidy/backends/stream/ext.conf
rename to mopidy/stream/ext.conf
diff --git a/setup.py b/setup.py
index 607496b7..52a1f2a8 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ setup(
             'http = mopidy.http:Extension [http]',
             'local = mopidy.backends.local:Extension',
             'mpd = mopidy.mpd:Extension',
-            'stream = mopidy.backends.stream:Extension',
+            'stream = mopidy.stream:Extension',
         ],
     },
     classifiers=[