Merge branch 'master' into release-2.1

mopidy · Oct 27, 2017 · cf5e41e · cf5e41e
2 parents 7862274 + f35bd06
commit cf5e41e
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 18 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,3 @@
-Please use https://discuss.mopidy.com/ for support questions.
+Please use https://discourse.mopidy.com/ for support questions.
 
 GitHub Issues should only be used for confirmed problems with Mopidy and well-defined feature requests.
diff --git a/README.rst b/README.rst
@@ -50,7 +50,7 @@ To get started with Mopidy, check out
 `the installation docs <http://docs.mopidy.com/en/latest/installation/>`_.
 
 - `Documentation <https://docs.mopidy.com/>`_
-- `Discussion forum <https://discuss.mopidy.com/>`_
+- `Discussion forum <https://discourse.mopidy.com/>`_
 - `Source code <https://github.com/mopidy/mopidy>`_
 - `Issue tracker <https://github.com/mopidy/mopidy/issues>`_
 - IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_

diff --git a/docs/audio.rst b/docs/audio.rst
@@ -84,6 +84,13 @@ simultaneously. To use the Icecast output, do the following:
 
        [audio]
        output = audioresample ! audioconvert ! vorbisenc ! oggmux ! shout2send mount=mopidy ip=127.0.0.1 port=8000 password=hackme
+    
+   Example for MP3 streaming and local audio (multiple outputs):
+
+   .. code-block:: ini
+
+       [audio]
+       output = tee name=t ! queue ! audioresample ! autoaudiosink t. ! queue ! lamemp3enc ! shout2send mount=mopidy ip=127.0.0.1 port=8000 password=hackme
 
 Other advanced setups are also possible for outputs. Basically, anything you
 can use with the ``gst-launch-1.0`` command can be plugged into

diff --git a/docs/conf.py b/docs/conf.py
@@ -136,7 +136,8 @@ def setup(app):
     'js': ('https://github.com/mopidy/mopidy.js/issues/%s', 'mopidy.js#'),
     'mpris': (
         'https://github.com/mopidy/mopidy-mpris/issues/%s', 'mopidy-mpris#'),
-    'discuss': ('https://discuss.mopidy.com/t/%s', 'discuss.mopidy.com/t/'),
+    'discuss': (
+        'https://discourse.mopidy.com/t/%s', 'discourse.mopidy.com/t/'),
 }
 
 

diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -15,7 +15,7 @@ Asking questions
 Please get in touch with us in one of these ways when requesting help with
 Mopidy and its extensions:
 
-- Our discussion forum: `discuss.mopidy.com <https://discuss.mopidy.com>`_.
+- Our discussion forum: `discourse.mopidy.com <https://discourse.mopidy.com>`_.
   Just sign in and fire away.
 
 - Our IRC channel: `#mopidy <https://webchat.freenode.net/?channels=#mopidy>`_
@@ -51,8 +51,8 @@ Issue guidelines
    tracker is not a support forum.
 
 #. If you are not sure if what you're experiencing is a bug or not, post in the
-   `discussion forum <https://discuss.mopidy.com>`__ first to verify that it's
-   a bug.
+   `discussion forum <https://discourse.mopidy.com>`__ first to verify that
+   it's a bug.
 
 #. If you are sure that you've found a bug or have a feature request, check if
    there's already an issue in the `issue tracker

diff --git a/docs/ext/auto.png b/docs/ext/auto.png
diff --git a/docs/ext/backends.rst b/docs/ext/backends.rst
@@ -48,6 +48,15 @@ Provides a backend for playing music from your `Beets
 <http://beets.radbox.org/>`_ music library through Beets' web extension.
 
 
+Mopidy-Deezer
+=============
+
+https://github.com/rusty-dev/mopidy-deezer
+
+Extension for playing music from the `Deezer <http://www.deezer.com/>`_ music
+streaming service.
+
+
 Mopidy-Dirble
 =============
 
@@ -65,6 +74,15 @@ https://github.com/tkem/mopidy-dleyna
 Provides a backend for playing music from Digital Media Servers using
 the `dLeyna <https://01.org/dleyna>`_ D-Bus interface.
 
+
+Mopidy-Emby
+===========
+
+https://github.com/xsteadfastx/mopidy-emby
+
+Provides a backend for playing music from `Emby Media Servers <https://emby.media>`_. 
+
+
 Mopidy-File
 ===========
 

diff --git a/docs/ext/iris.jpg b/docs/ext/iris.jpg
diff --git a/docs/ext/web.rst b/docs/ext/web.rst
@@ -30,18 +30,38 @@ To install, run::
     pip install Mopidy-API-Explorer
 
 
-Mopidy-Iris (formerly Mopidy-Spotmop)
-=====================================
+Mopidy-Auto
+===========
+
+https://github.com/gotling/mopidy-auto
+
+Mopidy extension to automate music playback based on time of day.
+
+.. warning::
+    This extension reacts to the events ``tracklist_changed``, ``track_playback_ended``, and
+    ``track_playback_resumed`` to accomplish its goals. Other web extensions will not work
+    as expected when this extension is installed.
+
+.. image:: /ext/auto.png
+    :width: 533
+    :height: 370
+
+To install, run::
+
+    pip install Mopidy-Auto
+
+
+Mopidy-Iris
+===========
 
 https://github.com/jaedb/iris
 
-A comprehensive client designed for Spotify users, with support for a
-variety of other backends. Built using React and Redux. Made by James 
-Barnsley.
+A comprehensive and mobile-friendly client that presents your library and extensions in a 
+user-friendly and intuitive interface. Built using React and Redux. Made by James Barnsley.
 
 .. image:: /ext/iris.jpg
-    :width: 720
-    :height: 455
+    :width: 888
+    :height: 646
 
 To install, run::
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -59,9 +59,9 @@ To get started with Mopidy, start by reading :ref:`installation`.
 **Getting help**
 
 If you get stuck, you can get help at the `Mopidy discussion forum
-<https://discuss.mopidy.com/>`_. We also hang around at IRC on the ``#mopidy``
-channel at `irc.freenode.net <http://freenode.net/>`_. The IRC channel has
-`public searchable logs <https://botbot.me/freenode/mopidy/>`_.
+<https://discourse.mopidy.com/>`_. We also hang around at IRC on the
+``#mopidy`` channel at `irc.freenode.net <http://freenode.net/>`_. The IRC
+channel has `public searchable logs <https://botbot.me/freenode/mopidy/>`_.
 
 If you stumble into a bug or have a feature request, please create an issue in
 the `issue tracker <https://github.com/mopidy/mopidy/issues>`_. If you're

diff --git a/docs/sponsors.rst b/docs/sponsors.rst
@@ -16,7 +16,7 @@ for free. We use their services for the following sites:
 
 - Hosting of the APT package repository at https://apt.mopidy.com.
 
-- Hosting of the Discourse forum at https://discuss.mopidy.com.
+- Hosting of the Discourse forum at https://discourse.mopidy.com.
 
 - Mailgun for sending emails from the Discourse forum.
 

diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
@@ -6,7 +6,7 @@ Troubleshooting
 
 If you run into problems with Mopidy, we usually hang around at ``#mopidy`` on
 `irc.freenode.net <http://freenode.net/>`_ and also have a `discussion forum
-<https://discuss.mopidy.com/c/mopidy>`_.
+<https://discourse.mopidy.com/c/mopidy>`_.
 If you stumble into a bug or have a feature request, please create an issue in
 the `issue tracker <https://github.com/mopidy/mopidy/issues>`_.