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

Conflicts:
	mopidy/audio/playlists.py
This commit is contained in:
Stein Magnus Jodal 2015-02-12 23:17:29 +01:00
commit 80516cab01
4 changed files with 7 additions and 6 deletions

BIN
docs/ext/mopify.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 189 KiB

View File

@ -64,12 +64,13 @@ Mopidy-Mopify
https://github.com/dirkgroenen/mopidy-mopify
An web client that mainly targets using Spotify through Mopidy. Made by Dirk
Groenen.
A web client that uses external web services to provide additional features and
a more "complete" Spotify music experience. It's currently targeted at people
using Spotify through Mopidy. Made by Dirk Groenen.
.. image:: /ext/mopify.png
:width: 720
:height: 424
.. image:: /ext/mopify.jpg
:width: 800
:height: 416
To install, run::

View File

@ -76,7 +76,7 @@ def parse_pls(data):
for section in cp.sections():
if section.lower() != 'playlist':
continue
for i in xrange(cp.getint(section, 'numberofentries')):
for i in range(cp.getint(section, 'numberofentries')):
yield cp.get(section, 'file%d' % (i + 1))