Merge branch 'release/v0.19.x' into develop

docs/clients/upnp.rst

@@ -18,7 +18,7 @@ DLNA Digital Media Server (DMS) / UPnP AV MediaServer:
     A MediaServer provides a library of media and is capable of streaming that
     media to a MediaRenderer. If Mopidy was a MediaServer, you could browse and
     play Mopidy's music on a TV, smartphone, or tablet supporting UPnP. Mopidy
-    does not currently support this, but we may in the future.  :issue:`52` is
+    does not currently support this, but we may in the future. :issue:`52` is
     the relevant wishlist issue.
 
 DLNA Digital Media Renderer (DMR) / UPnP AV MediaRenderer:
@@ -27,13 +27,51 @@ DLNA Digital Media Renderer (DMR) / UPnP AV MediaRenderer:
     given media, typically served by a MediaServer. If Mopidy was a
     MediaRenderer, you could use e.g. your smartphone or tablet to make Mopidy
     play media. Mopidy *does already* have experimental support for being a
-    MediaRenderer with the help of Rygel, as you can read more about below.
+    MediaRenderer, as you can read more about below.
+
+
+Mopidy as an UPnP MediaRenderer
+===============================
+
+There are two ways Mopidy can be made available as an UPnP MediaRenderer:
+Using Mopidy-MPRIS and Rygel, or using Mopidy-MPD and upmpdcli.
+
+
+.. _upmpdcli:
+
+upmpdcli
+--------
+
+`upmpdcli <http://www.lesbonscomptes.com/upmpdcli/>`_ is recommended, since it
+is easier to setup, and offers `OpenHome <http://www.openhome.org> ohMedia`_
+compatibility. upmpdcli exposes a UPnP MediaRenderer to the network, while
+using the MPD protocol to control Mopidy.
+
+1. Install upmpdcli. On Debian/Ubuntu::
+
+       apt-get install upmpdcli
+
+   Alternatively, follow the instructions from the upmpdcli website.
+
+2. The default settings of upmpdcli will work with the default settings of
+   :ref:`ext-mpd`. Edit :file:`/etc/upmpdcli.conf` if you want to use different
+   ports, hosts, or other settings.
+
+3. Start upmpdcli using the command::
+
+       upmpdcli
+
+   Or, run it in the background as a service::
+
+       sudo service upmpdcli start
+
+4. A UPnP renderer should be available now.
 
 
 .. _rygel:
 
-How to make Mopidy available as an UPnP MediaRenderer
+Rygel
-=====================================================
+-----
 
 With the help of `the Rygel project <https://live.gnome.org/Rygel>`_ Mopidy can
 be made available as an UPnP MediaRenderer. Rygel will interface with the MPRIS
@@ -41,15 +79,15 @@ interface provided by the `Mopidy-MPRIS extension
 <https://github.com/mopidy/mopidy-mpris>`_, and make Mopidy available as a
 MediaRenderer on the local network. Since this depends on the MPRIS frontend,
 which again depends on D-Bus being available, this will only work on Linux, and
-not OS X.  MPRIS/D-Bus is only available to other applications on the same
+not OS X. MPRIS/D-Bus is only available to other applications on the same
 host, so Rygel must be running on the same machine as Mopidy.
 
-1. Start Mopidy and make sure the MPRIS frontend is working.  It is activated
+1. Start Mopidy and make sure the MPRIS frontend is working. It is activated
    by default when the Mopidy-MPRIS extension is installed, but you may miss
    dependencies or be using OS X, in which case it will not work. Check the
    console output when Mopidy is started for any errors related to the MPRIS
    frontend. If you're unsure it is working, there are instructions for how to
-   test it on in the `Mopidy-MPRIS readme
+   test it in the `Mopidy-MPRIS readme
    <https://github.com/mopidy/mopidy-mpris>`_.
 
 2. Install Rygel. On Debian/Ubuntu::

docs/installation/raspberrypi.rst

@@ -74,13 +74,13 @@ you a lot better performance.
 #. Install Mopidy and its dependencies as described in :ref:`debian-install`.
 
 #. Finally, you need to set a couple of :doc:`config values </config>`, and
-   then you're ready to :doc:`run Mopidy </running>`. Alternatively you may 
+   then you're ready to :doc:`run Mopidy </running>`. Alternatively you may
    want to have Mopidy run as a :doc:`system service </debian>`, automatically
    starting at boot.
 
 
-Appendix: Fixing audio quality issues
+Appendix A: Fixing audio quality issues
-=====================================
+=======================================
 
 As of about April 2013 the following steps should resolve any audio
 issues for HDMI and analog without the use of an external USB sound
@@ -141,3 +141,35 @@ not determined the exact revision that fixed this::
 The only remaining known issue is a slight gap in playback at track changes
 this is likely due to gapless playback not being implemented and is being
 worked on irrespective of Raspberry Pi related work.
+
+
+Appendix B: Raspbmc not booting
+===============================
+
+Due to a dependency version problem where XBMC uses another version of libtag
+than what Debian originally ships with, you might have to make some minor
+changes for Raspbmc to start properly after installing Mopidy.
+
+If you notice that XBMC is not starting but gets stuck in a loop,
+you need to make the following changes::
+
+    sudo ln -sf /home/pi/.xbmc-current/xbmc-bin/lib/xbmc/system/libtag.so.1 \
+        /usr/lib/arm-linux-gnueabihf/libtag.so.1
+
+However, this will not persist the changes.  To persist the changes edit
+:file:`/etc/ld.so.conf.d/arm-linux-gnueabihf.conf` and add the following at the
+top::
+
+    /home/pi/.xbmc-current/xbmc-bin/lib/xbmc/system
+
+It's very important to add it at the top of the file as this indicates the
+priority of the folder in which to look for shared libraries.
+
+XBMC doesn't play nicely with the system wide installed version of libtag that
+got installed together with Mopidy, but rather vendors in its own version.
+
+More info about this issue can be found in `this post
+<http://geeks.noeit.com/xbmc-library-dependency-error/>`_.
+
+Please note that if you're running Xbian or another XBMC distribution these
+instructions might vary for your system.