Merge branch 'develop' into feature/local-json

docs/changelog.rst

@@ -22,6 +22,16 @@ a temporary regression of :issue:`527`.
   graceful removal of :confval:`local/tag_cache_file`
 
 
+v0.18.0 (UNRELEASED)
+====================
+
+**Internal changes**
+
+- Events from the audio actor, backends, and core actor are now emitted
+  asyncronously through the GObject event loop. This should resolve the issue
+  that has blocked the merge of the EOT-vs-EOS fix for a long time.
+
+
 v0.17.0 (2013-11-23)
 ====================
 

docs/clients/http.rst

@@ -19,15 +19,18 @@ woutervanwijk/Mopidy-Webclient
 ==============================
 
 .. image:: /_static/woutervanwijk-mopidy-webclient.png
-    :width: 382
-    :height: 621
+    :width: 1275
+    :height: 600
 
-The first web client for Mopidy is still under development, but is already very
-usable. It targets both desktop and mobile browsers.
+The first web client for Mopidy, made with jQuery Mobile by Wouter van Wijk.
+Also the web client used for Wouter's popular `Pi Musicbox
+<http://www.woutervanwijk.nl/pimusicbox/>`_ image for Raspberry Pi.
 
-The web client used for the `Pi Musicbox
-<http://www.woutervanwijk.nl/pimusicbox/>`_ is also available for other users
-of Mopidy. See https://github.com/woutervanwijk/Mopidy-WebClient for details.
+    With Mopidy Browser Client, you can play your music on your computer (or
+    Rapsberry Pi) and remotely control it from a computer, phone, tablet,
+    laptop. From your couch.
+
+    -- https://github.com/woutervanwijk/Mopidy-WebClient
 
 
 Mopidy Lux
@@ -37,15 +40,40 @@ Mopidy Lux
     :width: 1000
     :height: 645
 
-New web client developed by Janez Troha. See
-https://github.com/dz0ny/mopidy-lux for details.
+A Mopidy web client made with AngularJS by Janez Troha.
+
+    A shiny new remote web control interface for Mopidy player.
+
+    -- https://github.com/dz0ny/mopidy-lux
+
+
+Moped
+=====
+
+.. image:: /_static/martijnboland-moped.png
+    :width: 720
+    :height: 450
+
+A Mopidy web client made with Durandal and KnockoutJS by Martijn Boland.
+
+    Moped is a responsive web client for the Mopidy music server. It is
+    inspired by Mopidy-Webclient, but built from scratch based on a different
+    technology stack with Durandal and Bootstrap 3.
+
+    -- https://github.com/martijnboland/moped
 
 
 JukePi
 ======
 
-New web client developed by Meantime IT in the UK for their office jukebox. See
-https://github.com/meantimeit/jukepi for details.
+A Mopidy web client made with Backbone.js by Meantime IT in the UK for their
+office jukebox.
+
+    JukePi is a web client for the Mopidy music server. Mopidy empowers you to
+    create a custom music server that can connect to Spotify, play local mp3s
+    and more.
+
+    -- https://github.com/meantimeit/jukepi
 
 
 Other web clients

docs/ext/local.rst

@@ -50,7 +50,8 @@ Configuration values
 
 .. confval:: local/excluded_file_extensions
 
-    File extensions to exclude when scanning the media directory.
+    File extensions to exclude when scanning the media directory. Values
+    should be separated by either comma or newline.
 
 
 Usage

docs/ext/stream.rst

@@ -39,7 +39,8 @@ Configuration values
 
 .. confval:: stream/protocols
 
-    Whitelist of URI schemas to allow streaming from.
+    Whitelist of URI schemas to allow streaming from. Values should be
+    separated by either comma or newline.
 
 
 Usage

mopidy/__main__.py

@@ -129,7 +129,7 @@ def create_file_structures_and_config(args, extensions):
 
     # Initialize whatever the last config file is with defaults
     config_file = args.config_files[-1]
-    if os.path.exists(config_file):
+    if os.path.exists(path.expand_path(config_file)):
         return
 
     try:

mopidy/config/schemas.py

@@ -54,7 +54,8 @@ class ConfigSchema(collections.OrderedDict):
     def deserialize(self, values):
         """Validates the given ``values`` using the config schema.
 
-         Returns a tuple with cleaned values and errors."""
+        Returns a tuple with cleaned values and errors.
+        """
         errors = {}
         result = {}