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

Merge branch 'master' into release-2.1

Browse Source
This commit is contained in:
Stein Magnus Jodal 2018-03-29 09:59:22 +02:00
commit b0c9117ed7
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/audio.rst
View File

@ -84,7 +84,7 @@ simultaneously. To use the Icecast output, do the following:
[audio] [audio]
output = audioresample ! audioconvert ! vorbisenc ! oggmux ! shout2send mount=mopidy ip=127.0.0.1 port=8000 password=hackme 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): Example for MP3 streaming and local audio (multiple outputs):
.. code-block:: ini .. code-block:: ini

20
docs/ext/backends.rst
View File

@ -48,15 +48,6 @@ Provides a backend for playing music from your `Beets
<http://beets.radbox.org/>`_ music library through Beets' web extension. <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 Mopidy-Dirble
============= =============
@ -80,7 +71,7 @@ Mopidy-Emby
https://github.com/xsteadfastx/mopidy-emby https://github.com/xsteadfastx/mopidy-emby
Provides a backend for playing music from `Emby Media Servers <https://emby.media>`_. Provides a backend for playing music from `Emby Media Servers <https://emby.media>`_.
Mopidy-File Mopidy-File
@ -182,6 +173,15 @@ Extension for listening to Internet radio stations and podcasts listed at
`radio.fr <http://www.radio.fr/>`_, and `radio.at <http://www.radio.at/>`_. `radio.fr <http://www.radio.fr/>`_, and `radio.at <http://www.radio.at/>`_.
Mopidy-RNZ
==========
https://github.com/danbrough/mopidy-rnz
Extension for playing `Radio New Zealands <http://www.radionz.co.nz>`_
podcasts,live streams and latest news bulletin.
Mopidy-SomaFM Mopidy-SomaFM
============= =============

12
docs/ext/web.rst
View File

@ -38,9 +38,10 @@ https://github.com/gotling/mopidy-auto
Mopidy extension to automate music playback based on time of day. Mopidy extension to automate music playback based on time of day.
.. warning:: .. warning::
This extension reacts to the events ``tracklist_changed``, ``track_playback_ended``, and This extension reacts to the events ``tracklist_changed``,
``track_playback_resumed`` to accomplish its goals. Other web extensions will not work ``track_playback_ended``, and ``track_playback_resumed`` to accomplish its
as expected when this extension is installed. goals. Other web extensions will not work as expected when this extension
is installed.
.. image:: /ext/auto.png .. image:: /ext/auto.png
:width: 533 :width: 533
@ -56,8 +57,9 @@ Mopidy-Iris
https://github.com/jaedb/iris https://github.com/jaedb/iris
A comprehensive and mobile-friendly client that presents your library and extensions in a A comprehensive and mobile-friendly client that presents your library and
user-friendly and intuitive interface. Built using React and Redux. Made by James Barnsley. extensions in a user-friendly and intuitive interface. Built using React and
Redux. Made by James Barnsley.
.. image:: /ext/iris.jpg .. image:: /ext/iris.jpg
:width: 888 :width: 888