diff --git a/docs/api/backends/concepts.rst b/docs/api/backends/concepts.rst index 0d476213..371e03bc 100644 --- a/docs/api/backends/concepts.rst +++ b/docs/api/backends/concepts.rst @@ -27,4 +27,3 @@ Providers: "Playback\ncontroller" -> "Playback\nproviders" Backend -> "Stored\nplaylists\ncontroller" "Stored\nplaylists\ncontroller" -> "Stored\nplaylist\nproviders" - Backend -> Mixer diff --git a/docs/api/backends/controllers.rst b/docs/api/backends/controllers.rst index 20dc2d61..bb1e20f5 100644 --- a/docs/api/backends/controllers.rst +++ b/docs/api/backends/controllers.rst @@ -20,19 +20,13 @@ The backend Playback controller =================== -Manages playback, with actions like play, pause, stop, next, previous, and -seek. +Manages playback, with actions like play, pause, stop, next, previous, +seek and volume control. .. autoclass:: mopidy.backends.base.PlaybackController :members: -Mixer controller -================ - -Manages volume. See :class:`mopidy.mixers.base.BaseMixer`. - - Current playlist controller =========================== diff --git a/docs/api/mixers.rst b/docs/api/mixers.rst deleted file mode 100644 index 2459db8c..00000000 --- a/docs/api/mixers.rst +++ /dev/null @@ -1,43 +0,0 @@ -********* -Mixer API -********* - -Mixers are responsible for controlling volume. Clients of the mixers will -simply instantiate a mixer and read/write to the ``volume`` attribute:: - - >>> from mopidy.mixers.alsa import AlsaMixer - >>> mixer = AlsaMixer() - >>> mixer.volume - 100 - >>> mixer.volume = 80 - >>> mixer.volume - 80 - -Most users will use one of the internal mixers which controls the volume on the -computer running Mopidy. If you do not specify which mixer you want to use in -the settings, Mopidy will choose one for you based upon what OS you run. See -:attr:`mopidy.settings.MIXER` for the defaults. - -Mopidy also supports controlling volume on other hardware devices instead of on -the computer running Mopidy through the use of custom mixer implementations. To -enable one of the hardware device mixers, you must the set -:attr:`mopidy.settings.MIXER` setting to point to one of the classes found -below, and possibly add some extra settings required by the mixer you choose. - -All mixers should subclass :class:`mopidy.mixers.base.BaseMixer` and override -methods as described below. - -.. automodule:: mopidy.mixers.base - :synopsis: Mixer API - :members: - - -Mixer implementations -===================== - -* :mod:`mopidy.mixers.alsa` -* :mod:`mopidy.mixers.denon` -* :mod:`mopidy.mixers.dummy` -* :mod:`mopidy.mixers.gstreamer_software` -* :mod:`mopidy.mixers.osa` -* :mod:`mopidy.mixers.nad` diff --git a/docs/changes.rst b/docs/changes.rst index 1e767d1c..2664a083 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -34,6 +34,14 @@ v0.8 (in development) ``autoaudiosink``. (Fixes: :issue:`81`, :issue:`115`, :issue:`121`, :issue:`159`) +- Switch to pure GStreamer based mixing. This implies that users setup a + GStreamer bin with a mixer in it in :attr:`mopidy.setting.MIXER`. The default + value is ``autoaudiomixer``, a custom mixer that attempts to find a mixer that + will work on your system. If this picks the wrong mixer you can of course + override it. Setting the mixer to :class:`None` is also support. MPD protocol + support for volume has also been updated to return -1 when we have no mixer + set. + v0.7.3 (2012-08-11) =================== diff --git a/docs/clients/mpd.rst b/docs/clients/mpd.rst index 4c789eba..844eaee7 100644 --- a/docs/clients/mpd.rst +++ b/docs/clients/mpd.rst @@ -181,11 +181,6 @@ they artist and album tabs do not hang. The folder tab still freezes when ``lsinfo`` returns a list of stored playlists, though zero files. Thus, we've discovered a couple of bugs in Droid MPD Client. -The volume control is very slick, with a turn knob, just like on an amplifier. -It lends itself to showing off to friends when combined with Mopidy's external -amplifier mixers. Everybody loves turning a knob on a touch screen and see the -physical knob on the amplifier turn as well ;-) - Even though ``lsinfo`` returns the stored playlists for the folder tab, they are not displayed anywhere. Thus, we had to select an album in the album tab to complete the test procedure. diff --git a/docs/installation/index.rst b/docs/installation/index.rst index fae50a1b..766616ac 100644 --- a/docs/installation/index.rst +++ b/docs/installation/index.rst @@ -46,9 +46,6 @@ dependencies installed. sudo apt-get install python-dbus python-indicate - - Some custom mixers (but not the default one) require additional - dependencies. See the docs for each mixer. - Install latest stable release ============================= diff --git a/docs/modules/mixers/alsa.rst b/docs/modules/mixers/alsa.rst deleted file mode 100644 index e8b7ed6c..00000000 --- a/docs/modules/mixers/alsa.rst +++ /dev/null @@ -1,7 +0,0 @@ -************************************************* -:mod:`mopidy.mixers.alsa` -- ALSA mixer for Linux -************************************************* - -.. automodule:: mopidy.mixers.alsa - :synopsis: ALSA mixer for Linux - :members: diff --git a/docs/modules/mixers/denon.rst b/docs/modules/mixers/denon.rst deleted file mode 100644 index 7fb2d6cc..00000000 --- a/docs/modules/mixers/denon.rst +++ /dev/null @@ -1,7 +0,0 @@ -***************************************************************** -:mod:`mopidy.mixers.denon` -- Hardware mixer for Denon amplifiers -***************************************************************** - -.. automodule:: mopidy.mixers.denon - :synopsis: Hardware mixer for Denon amplifiers - :members: diff --git a/docs/modules/mixers/dummy.rst b/docs/modules/mixers/dummy.rst deleted file mode 100644 index 8ac18e10..00000000 --- a/docs/modules/mixers/dummy.rst +++ /dev/null @@ -1,7 +0,0 @@ -***************************************************** -:mod:`mopidy.mixers.dummy` -- Dummy mixer for testing -***************************************************** - -.. automodule:: mopidy.mixers.dummy - :synopsis: Dummy mixer for testing - :members: diff --git a/docs/modules/mixers/gstreamer_software.rst b/docs/modules/mixers/gstreamer_software.rst deleted file mode 100644 index 98e09f44..00000000 --- a/docs/modules/mixers/gstreamer_software.rst +++ /dev/null @@ -1,7 +0,0 @@ -*************************************************************************** -:mod:`mopidy.mixers.gstreamer_software` -- Software mixer for all platforms -*************************************************************************** - -.. automodule:: mopidy.mixers.gstreamer_software - :synopsis: Software mixer for all platforms - :members: diff --git a/docs/modules/mixers/nad.rst b/docs/modules/mixers/nad.rst deleted file mode 100644 index 56291cbb..00000000 --- a/docs/modules/mixers/nad.rst +++ /dev/null @@ -1,7 +0,0 @@ -************************************************************* -:mod:`mopidy.mixers.nad` -- Hardware mixer for NAD amplifiers -************************************************************* - -.. automodule:: mopidy.mixers.nad - :synopsis: Hardware mixer for NAD amplifiers - :members: diff --git a/docs/modules/mixers/osa.rst b/docs/modules/mixers/osa.rst deleted file mode 100644 index a4363cb4..00000000 --- a/docs/modules/mixers/osa.rst +++ /dev/null @@ -1,7 +0,0 @@ -********************************************** -:mod:`mopidy.mixers.osa` -- Osa mixer for OS X -********************************************** - -.. automodule:: mopidy.mixers.osa - :synopsis: Osa mixer for OS X - :members: