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

Merge branch 'master' of git://github.com/jodal/mopidy

Browse Source
This commit is contained in:
Thomas Adamcik 2010-02-07 21:10:22 +01:00
commit bc7b13ec8c
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/Makefile
View File

@ -87,8 +87,8 @@ doctest:
@echo "Testing of doctests in the sources finished, look at the " \ @echo "Testing of doctests in the sources finished, look at the " \
"results in _build/doctest/output.txt." "results in _build/doctest/output.txt."
public: clean html public: clean dirhtml
rm -rf /tmp/mopidy-html && cp -r _build/html /tmp/mopidy-html rm -rf /tmp/mopidy-html && cp -r _build/dirhtml /tmp/mopidy-html
git stash save git stash save
cd .. && \ cd .. && \
git checkout gh-pages && \ git checkout gh-pages && \

22
docs/api/backends.rst
View File

@ -61,12 +61,11 @@
.. method:: move(start, end, to_position) .. method:: move(start, end, to_position)
Move the tracks at positions in [``start``, ``end``] to Move the tracks in the slice ``[start:end]`` to ``to_position``.
``to_position``.
:param start: position of first track to move :param start: position of first track to move
:type start: int :type start: int
:param end: position of last track to move :param end: position after last track to move
:type end: int :type end: int
:param to_position: new position for the tracks :param to_position: new position for the tracks
:type to_position: int :type to_position: int
@ -84,12 +83,12 @@
.. method:: shuffle(start=None, end=None) .. method:: shuffle(start=None, end=None)
Shuffles the playlist, optionally a part of the playlist given by Shuffles the entire playlist. If ``start`` and ``end`` is given only
``start`` and ``end``. shuffles the slice ``[start:end]``.
:param start: position of first track to shuffle :param start: position of first track to shuffle
:type start: int or :class:`None` :type start: int or :class:`None`
:param end: position of last track to shuffle :param end: position after last track to shuffle
:type end: int or :class:`None` :type end: int or :class:`None`
.. attribute:: version .. attribute:: version
@ -126,15 +125,12 @@
Constant representing the paused state. Constant representing the paused state.
.. method:: play(id=None, position=None) .. method:: play(track=None)
Play either the track with the given ID, the given position, or the Play the given track or the currently active track.
currently active track.
:param id: ID of track to play :param track: track to play
:type id: int :type track: :class:`mopidy.models.Track` or :class:`None`
:param position: position in current playlist of track to play
:type position: int
.. attribute:: PLAYING .. attribute:: PLAYING

2
docs/development.rst
View File

@ -34,7 +34,7 @@ To run tests, you need a couple of dependiencies. Some can be installed through
The rest can be installed using pip:: The rest can be installed using pip::
sudo aptitude install python-pip python-setuptools bzr sudo aptitude install python-pip python-setuptools bzr
pip install -r test-requirements.txt sudo pip install -r test-requirements.txt
Then, to run all tests:: Then, to run all tests::