Merge branch 'feature/simplify-outputs' into feature/switch-to-gst-mixers

docs/changes.rst

@@ -22,7 +22,7 @@ v0.8 (in development)
   currently seems to be more trouble than what it is worth.
   :attr:`mopidy.settings.OUTPUTS` setting is no longer supported, and has been
   replaced with :attr:`mopidy.settings.OUTPUT` which is a GStreamer
-  bin descriped in the same format as gst-launch expects. Default value is
+  bin described in the same format as ``gst-launch`` expects. Default value is
   ``autoaudiosink``.
 
 

docs/settings.rst

@@ -157,16 +157,17 @@ server simultaneously. To use the SHOUTcast output, do the following:
 #. Install, configure and start the Icecast server. It can be found in the
    ``icecast2`` package in Debian/Ubuntu.
 
-#. Set :attr:`mopidy.settings.OUTPUT` to ``lame ! shout2send`` (an ogg-vorbis
+#. Set :attr:`mopidy.settings.OUTPUT` to ``lame ! shout2send`` (an Ogg Vorbis
    encoder could be used instead of lame).
 
-#. You might also need to change the shout2send default settings, run
+#. You might also need to change the ``shout2send`` default settings, run
    ``gst-inspect-0.10 shout2send`` to see the available settings. Most likely
    you want to change ``ip``, ``username``, ``password`` and ``mount``. For
-   example, to set the password use: ``lame ! shout2send password="s3cret"``.
+   example, to set the password use:
+   ``lame ! shout2send username="foobar" password="s3cret"``.
 
 Other advanced setups are also possible for outputs. Basically anything you can
-get a gst-lauch command to output to can be plugged into
+get a ``gst-lauch`` command to output to can be plugged into
 :attr:`mopidy.settings.OUTPUT``.
 
 

mopidy/gstreamer.py

@@ -8,7 +8,7 @@ import logging
 from pykka.actor import ThreadingActor
 from pykka.registry import ActorRegistry
 
-from mopidy import settings, utils
+from mopidy import settings
 from mopidy.backends.base import Backend
 
 logger = logging.getLogger('mopidy.gstreamer')