andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Adamcik 2012-08-26 18:05:04 +02:00
commit 640ad3930f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.rst
View File

@ -22,7 +22,7 @@ v0.8 (in development)
currently seems to be more trouble than what it is worth. currently seems to be more trouble than what it is worth.
:attr:`mopidy.settings.OUTPUTS` setting is no longer supported, and has been :attr:`mopidy.settings.OUTPUTS` setting is no longer supported, and has been
replaced with :attr:`mopidy.settings.OUTPUT` which is a GStreamer 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``. ``autoaudiosink``.

9
docs/settings.rst
View File

@ -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 #. Install, configure and start the Icecast server. It can be found in the
``icecast2`` package in Debian/Ubuntu. ``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). 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 ``gst-inspect-0.10 shout2send`` to see the available settings. Most likely
you want to change ``ip``, ``username``, ``password`` and ``mount``. For 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 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``. :attr:`mopidy.settings.OUTPUT``.

2
mopidy/gstreamer.py
View File

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