diff --git a/docs/clients/http.rst b/docs/clients/http.rst index 296a1886..3fa6eadb 100644 --- a/docs/clients/http.rst +++ b/docs/clients/http.rst @@ -4,81 +4,4 @@ HTTP clients ************ -Mopidy added an :ref:`HTTP frontend ` and an :ref:`HTTP API -` in 0.10 which together provides the building blocks needed for -creating web clients for Mopidy with the help of a WebSocket and a JavaScript -library provided by Mopidy. - -This page will list any Mopidy web clients using the HTTP frontend. If you've -created one, please notify us so we can include your client on this page. - -See :ref:`http-api` for details on how to build your own web client. - - -.. include:: /ext/musicbox_webclient.rst - - -.. include:: /ext/moped.rst - - -.. include:: /ext/kuechenradio.rst - - -JukePi -====== - -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 - - -Apollo Player -============= - -A Mopidy web client made by Argonaut in SF for their office jukebox. - - Mopidy frontend community driven playlist. Driven by Node.js, Backbone.js, - and Require.js. - --- https://github.com/samcreate/Apollo-Player - - We've released ARGONAUT's first open source playlist app, APOLLO. It uses - Mopidy (and the Mopidy Spotify plugin) to create a social listening - experience for your home or office. - - Users authenticate via Twitter, then search the Spotify library and add - tracks to the playlist, which plays on the local machine (via Node.js - server). When the playlist runs out, it switches to a default playlist that - you define. - - Users can also bomb a track---if it receives 3 down votes, it plays a - Spotify track to announce the bomb (we use "children booing")---then skips - to the next track. - --- http://blog.argonautinc.com/post/83027259908/music-is-pretty-important-to-our-culture-and - - -Mopify -====== - -An in-development web client that clones the Spotify user interface on top of -Mopidy and the Spotify web APIs. - - A Mopidy web client based on the Spotify webbased interface. If you use - Mopidy in combination with local music this client probably won't work. - This client uses the Spotify and EchoNest API to speed up searching and - artist/album lookup. - - -- https://github.com/dirkgroenen/Mopify - - -Other web clients -================= - -For Mopidy web clients using Mopidy's MPD frontend instead of HTTP, see -:ref:`mpd-web-clients`. +See :ref:`ext-web`. diff --git a/docs/ext/api_explorer.rst b/docs/ext/api_explorer.rst deleted file mode 100644 index 3049a647..00000000 --- a/docs/ext/api_explorer.rst +++ /dev/null @@ -1,16 +0,0 @@ -.. _http-explore-extension: - -Mopidy-API-Explorer -=================== - -https://github.com/dz0ny/mopidy-api-explorer - -Web extension for browsing the Mopidy HTTP API. - -.. image:: /ext/api_explorer.png - :width: 1176 - :height: 713 - -To install, run:: - - pip install Mopidy-API-Explorer diff --git a/docs/ext/backends.rst b/docs/ext/backends.rst index 5b7c99bb..6f3195ff 100644 --- a/docs/ext/backends.rst +++ b/docs/ext/backends.rst @@ -11,6 +11,16 @@ This list is moderated and updated on a regular basis. If you want your package to show up here, follow the :ref:`guide on creating extensions `. +Mopidy-AudioAddict +================== + +https://github.com/nilicule/mopidy-audioaddict + +Provides a backend for playing music from the AudioAddict network of sites, +including Digitally Imported, RadioTunes, RockRadio, JazzRadio, and +FrescaRadio. + + Mopidy-Banshee ============== @@ -80,6 +90,28 @@ Mopidy-Local Bundled with Mopidy. See :ref:`ext-local`. +Mopidy-Local-SQLite +=================== + +https://github.com/tkem/mopidy-local-sqlite + +Extension which plugs into Mopidy-Local to use an SQLite database to keep +track of your local media. This extension lets you browse your music collection +by album, artist, composer and performer, and provides full-text search +capabilities based on SQLite's FTS modules. It also notices updates via +``mopidy local scan`` while Mopidy is running, so you can scan your media +library periodically from a cron job, for example. + + +Mopidy-OE1 +========== + +https://github.com/tischlda/mopidy-oe1 + +Extension for playing the live stream and browsing the 7-day archive of the +Austrian radio station OE1. + + Mopidy-Podcast ============== diff --git a/docs/ext/frontends.rst b/docs/ext/frontends.rst index 1010b1f6..50dc348f 100644 --- a/docs/ext/frontends.rst +++ b/docs/ext/frontends.rst @@ -12,6 +12,14 @@ This list is moderated and updated on a regular basis. If you want your package to show up here, follow the :ref:`guide on creating extensions `. +Mopidy-EvtDev +============= + +https://github.com/liamw9534/mopidy-evtdev + +Extension for controll Mopidy from virtual input devices. + + Mopidy-HTTP =========== @@ -56,3 +64,21 @@ https://github.com/9and3r/mopidy-touchscreen Extension for displaying track info and controlling Mopidy from a touch screen using `PyGame `_/SDL. + + +Mopidy-TtsGpio +============== + +https://github.com/9and3r/mopidy-ttsgpio + +Extension for controlling Mopidy without a display by using e.g. buttons +connected to GPIO and text-to-speech for track information. + + +Mopidy-Webhooks +=============== + +https://github.com/paddycarey/mopidy-webhooks + +Extension for sending HTTP POST requests with JSON payloads to a remote server +on when Mopidy core triggers an event and on regular intervals. diff --git a/docs/ext/kuechenradio.rst b/docs/ext/kuechenradio.rst deleted file mode 100644 index 5288caeb..00000000 --- a/docs/ext/kuechenradio.rst +++ /dev/null @@ -1,11 +0,0 @@ -Mopidy-HTTP-Kuechenradio -========================= - -https://github.com/tkem/mopidy-http-kuechenradio - -A deliberately simple Mopidy Web client for mobile devices. Made with jQuery -Mobile by Thomas Kemmer. - -To install, run:: - - pip install Mopidy-HTTP-Kuechenradio diff --git a/docs/ext/moped.rst b/docs/ext/moped.rst deleted file mode 100644 index 573a6519..00000000 --- a/docs/ext/moped.rst +++ /dev/null @@ -1,14 +0,0 @@ -Mopidy-Moped -============ - -https://github.com/martijnboland/moped - -A Mopidy web client made with AngularJS by Martijn Boland. - -.. image:: /ext/moped.png - :width: 720 - :height: 450 - -To install, run:: - - pip install Mopidy-Moped diff --git a/docs/ext/mopify.png b/docs/ext/mopify.png new file mode 100644 index 00000000..94ca9d17 Binary files /dev/null and b/docs/ext/mopify.png differ diff --git a/docs/ext/musicbox_webclient.rst b/docs/ext/musicbox_webclient.rst deleted file mode 100644 index 83cc4e37..00000000 --- a/docs/ext/musicbox_webclient.rst +++ /dev/null @@ -1,16 +0,0 @@ -Mopidy-MusicBox-Webclient -========================= - -https://github.com/woutervanwijk/Mopidy-MusicBox-Webclient - -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 -`_ image for Raspberry Pi. - -.. image:: /ext/musicbox_webclient.png - :width: 1275 - :height: 600 - -To install, run:: - - pip install Mopidy-MusicBox-Webclient diff --git a/docs/ext/simple_webclient.png b/docs/ext/simple_webclient.png new file mode 100644 index 00000000..3f430ef9 Binary files /dev/null and b/docs/ext/simple_webclient.png differ diff --git a/docs/ext/web.rst b/docs/ext/web.rst index 8a72c7e1..9f45e3d2 100644 --- a/docs/ext/web.rst +++ b/docs/ext/web.rst @@ -12,13 +12,123 @@ This list is moderated and updated on a regular basis. If you want your package to show up here, follow the :ref:`guide on creating extensions `. -.. include:: /ext/api_explorer.rst +.. _http-explore-extension: + +Mopidy-API-Explorer +=================== + +https://github.com/dz0ny/mopidy-api-explorer + +Web extension for browsing the Mopidy HTTP API. + +.. image:: /ext/api_explorer.png + :width: 1176 + :height: 713 + +To install, run:: + + pip install Mopidy-API-Explorer -.. include:: /ext/kuechenradio.rst +Mopidy-HTTP-Kuechenradio +========================= + +https://github.com/tkem/mopidy-http-kuechenradio + +A deliberately simple Mopidy Web client for mobile devices. Made with jQuery +Mobile by Thomas Kemmer. + +To install, run:: + + pip install Mopidy-HTTP-Kuechenradio -.. include:: /ext/moped.rst +Mopidy-Moped +============ + +https://github.com/martijnboland/moped + +A Mopidy web client made with AngularJS by Martijn Boland. + +.. image:: /ext/moped.png + :width: 720 + :height: 450 + +To install, run:: + + pip install Mopidy-Moped -.. include:: /ext/musicbox_webclient.rst +Mopidy-Mopify +============= + +https://github.com/dirkgroenen/mopidy-mopify + +An web client that mainly targets using Spotify through Mopidy. Made by Dirk +Groenen. + +.. image:: /ext/mopify.png + :width: 720 + :height: 424 + +To install, run:: + + pip install Mopidy-Mopify + + +Mopidy-MusicBox-Webclient +========================= + +https://github.com/woutervanwijk/Mopidy-MusicBox-Webclient + +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 +`_ image for Raspberry Pi. + +.. image:: /ext/musicbox_webclient.png + :width: 1275 + :height: 600 + +To install, run:: + + pip install Mopidy-MusicBox-Webclient + + +Mopidy-Simple-Webclient +======================= + +https://github.com/xolox/mopidy-simple-webclient + +A minimalistic web client targeted for mobile devices. Made with jQuery and +Bootstrap by Peter Odding. + +.. image:: /ext/simple_webclient.png + :width: 473 + :height: 373 + +To install, run:: + + pip install Mopidy-Simple-Webclient + + +Mopidy-WebSettings +================== + +https://github.com/woutervanwijk/mopidy-websettings + +A web extension for changing settings. Used by the Pi MusicBox distribution +for Raspberry Pi, but also usable for other projects. + + +Other web clients +================= + +There's also some other web clients for Mopidy that use the :ref:`http-api`, +but isn't installable using ``pip``: + +- `Apollo Player `_ +- `JukePi `_ + +In addition, there's several web based MPD clients, which doesn't use the +:ref:`ext-http` frontend at all, but connect to Mopidy through our +:ref:`ext-mpd` frontend. For a list of those, see :ref:`mpd-web-clients`. diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py index 1bce8734..4c567086 100644 --- a/mopidy/core/tracklist.py +++ b/mopidy/core/tracklist.py @@ -77,9 +77,9 @@ class TracklistController(object): consume = property(get_consume, set_consume) """ :class:`True` - Tracks are removed from the playlist when they have been played. + Tracks are removed from the tracklist when they have been played. :class:`False` - Tracks are not removed from the playlist. + Tracks are not removed from the tracklist. """ def get_random(self): @@ -96,9 +96,9 @@ class TracklistController(object): random = property(get_random, set_random) """ :class:`True` - Tracks are selected at random from the playlist. + Tracks are selected at random from the tracklist. :class:`False` - Tracks are played in the order of the playlist. + Tracks are played in the order of the tracklist. """ def get_repeat(self): @@ -112,10 +112,10 @@ class TracklistController(object): repeat = property(get_repeat, set_repeat) """ :class:`True` - The current playlist is played repeatedly. To repeat a single track, - select both :attr:`repeat` and :attr:`single`. + The tracklist is played repeatedly. To repeat a single track, select + both :attr:`repeat` and :attr:`single`. :class:`False` - The current playlist is played once. + The tracklist is played once. """ def get_single(self): @@ -175,10 +175,10 @@ class TracklistController(object): The track that will be played if calling :meth:`mopidy.core.PlaybackController.next()`. - For normal playback this is the next track in the playlist. If repeat - is enabled the next track can loop around the playlist. When random is + For normal playback this is the next track in the tracklist. If repeat + is enabled the next track can loop around the tracklist. When random is enabled this should be a random track, all tracks should be played once - before the list repeats. + before the tracklist repeats. :param tl_track: the reference track :type tl_track: :class:`mopidy.models.TlTrack` or :class:`None` @@ -217,7 +217,7 @@ class TracklistController(object): Returns the track that will be played if calling :meth:`mopidy.core.PlaybackController.previous()`. - For normal playback this is the previous track in the playlist. If + For normal playback this is the previous track in the tracklist. If random and/or consume is enabled it should return the current track instead.