aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/mpd.14
-rw-r--r--doc/mpd.conf.525
-rw-r--r--doc/mpdconf.example38
-rw-r--r--doc/protocol.xml38
-rw-r--r--doc/user.xml69
5 files changed, 102 insertions, 72 deletions
diff --git a/doc/mpd.1 b/doc/mpd.1
index f2fd2286f..22c0e7510 100644
--- a/doc/mpd.1
+++ b/doc/mpd.1
@@ -34,8 +34,8 @@ Do not create database, even if it doesn't exist.
.BI --no-daemon
Don't detach from console.
.TP
-.BI --stdout
-Print messages to stdout and stderr.
+.BI --stderr
+Print messages stderr.
.TP
.BI --verbose
Verbose logging.
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 776fdbefd..940263795 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -168,25 +168,6 @@ only choice) if MPD was compiled without libsamplerate.
For an up-to-date list of available converters, please see the libsamplerate
documentation (available online at <\fBhttp://www.mega-nerd.com/SRC/\fP>).
.TP
-.B mixer_type <alsa, oss, software, hardware or disabled>
-This specifies which mixer to use. The default is hardware and depends on
-what audio output support mpd was built with. Options alsa and oss are
-legacy and should not be used in new configs, but when set mixer_device
-and mixer_control will apply.
-.TP
-.B mixer_device <mixer dev>
-This specifies which mixer to use. The default for oss is
-"/dev/mixer"; the default for alsa is "default". This global option is
-deprecated and should not be used. Look at the mixer_device option of
-corresponding output device instead.
-.TP
-.B mixer_control <mixer ctrl>
-This specifies which mixer control to use (sometimes referred to as
-the "device"). Examples of mixer controls are PCM, Line1, Master,
-etc. An example for OSS is "Pcm", and an example for alsa is
-"PCM". This global option is deprecated and should not be used. Look
-at the mixer_control option of corresponding output device instead.
-.TP
.B replaygain <album or track>
If specified, mpd will adjust the volume of songs played using ReplayGain tags
(see <\fBhttp://www.replaygain.org/\fP>). Setting this to "album" will adjust
@@ -285,6 +266,12 @@ whatever audio format is passed to the audio output.
.B device <dev>
This specifies the device to use for audio output. The default is "default".
.TP
+.B mixer_type <hardware, software or none>
+Specifies which mixer should be used for this audio output: the
+hardware mixer (available for ALSA, OSS and PulseAudio), the software
+mixer or no mixer ("none"). By default, the hardware mixer is used
+for devices which support it, and none for the others.
+.TP
.B mixer_device <mixer dev>
This specifies which mixer to use. The default is "default". To use
the second sound card in a system, use "hw:1".
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 919326236..1dce635b2 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -61,6 +61,13 @@
#
#user "nobody"
#
+# This setting specifies the group that MPD will run as. If not specified
+# primary group of user specified with "user" setting will be used (if set).
+# This is useful if MPD needs to be a member of group such as "audio" to
+# have permission to use sound card.
+#
+#group "nogroup"
+#
# This setting sets the address for the daemon to listen on. Careful attention
# should be paid if this is assigned to anything other then the default, any.
# This setting can deny access to control of the daemon.
@@ -179,6 +186,7 @@ input {
# name "My ALSA Device"
# device "hw:0,0" # optional
# format "44100:16:2" # optional
+# mixer_type "hardware" # optional
# mixer_device "default" # optional
# mixer_control "PCM" # optional
# mixer_index "0" # optional
@@ -191,6 +199,7 @@ input {
# name "My OSS Device"
# device "/dev/dsp" # optional
# format "44100:16:2" # optional
+# mixer_type "hardware" # optional
# mixer_device "/dev/mixer" # optional
# mixer_control "PCM" # optional
#}
@@ -214,6 +223,7 @@ input {
# genre "jazz" # optional
# public "no" # optional
# timeout "2" # optional
+# mixer_type "software" # optional
#}
#
# An example of a httpd output (built-in HTTP streaming server):
@@ -255,6 +265,7 @@ input {
#audio_output {
# type "null"
# name "My Null Output"
+# mixer_type "none" # optional
#}
#
# This setting will change all decoded audio to be converted to the specified
@@ -273,33 +284,6 @@ input {
###############################################################################
-# Volume control mixer ########################################################
-#
-# These are the global volume control settings. By default, this setting will
-# be detected to the available audio output device, with preference going to
-# hardware mixing. Hardware and software mixers for individual audio_output
-# sections cannot yet be mixed.
-#
-# An example for controlling an ALSA, OSS or Pulseaudio mixer; If this
-# setting is used other sound applications will be affected by the volume
-# being controlled by MPD.
-#
-#mixer_type "hardware"
-#
-# An example for controlling all mixers through software. This will control
-# all controls, even if the mixer is not supported by the device and will not
-# affect any other sound producing applications.
-#
-#mixer_type "software"
-#
-# This example will not allow MPD to touch the mixer at all and will disable
-# all volume controls.
-#
-#mixer_type "disabled"
-#
-###############################################################################
-
-
# Normalization automatic volume adjustments ##################################
#
# This setting specifies the type of ReplayGain to use. This setting can have
diff --git a/doc/protocol.xml b/doc/protocol.xml
index 792227a1a..7c93df50f 100644
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
@@ -139,6 +139,15 @@
</listitem>
<listitem>
<para>
+ <returnvalue>update</returnvalue>: a database update
+ has started or finished. If the database was
+ modified during the update, the
+ <returnvalue>database</returnvalue> event is also
+ emitted.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<returnvalue>stored_playlist</returnvalue>: a stored
playlist has been modified, renamed, created or
deleted
@@ -279,6 +288,16 @@
</listitem>
<listitem>
<para>
+ <varname>elapsed</varname>:
+ <footnote id="since_0_16"><simpara>Since MPD 0.16</simpara></footnote>
+ <returnvalue>
+ Total time elapsed within the current song, but
+ with higher resolution.
+ </returnvalue>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<varname>bitrate</varname>:
<returnvalue>instantaneous bitrate in
kbps</returnvalue>
@@ -453,25 +472,6 @@
</para>
</listitem>
</varlistentry>
- <varlistentry id="command_volume">
- <term>
- <cmdsynopsis>
- <command>volume</command>
- <arg choice="req"><replaceable>CHANGE</replaceable></arg>
- </cmdsynopsis>
- </term>
- <listitem>
- <para>
- Changes volume by amount <varname>CHANGE</varname>.
- </para>
- <note>
- <para>
- <command>volume</command> is deprecated, use
- <command>setvol</command> instead.
- </para>
- </note>
- </listitem>
- </varlistentry>
</variablelist>
</section>
diff --git a/doc/user.xml b/doc/user.xml
index 6c3f5edeb..6e039ebde 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -319,13 +319,72 @@ cd mpd-version</programlisting>
</row>
<row>
<entry>
- <varname>mixer_enabled</varname>
- <parameter>yes|no</parameter>
+ <varname>mixer_type</varname>
+ <parameter>hardware|software|none</parameter>
+ </entry>
+ <entry>
+ Specifies which mixer should be used for this audio
+ output: the hardware mixer (available for ALSA, OSS
+ and PulseAudio), the software mixer or no mixer
+ ("none"). By default, the hardware mixer is used for
+ devices which support it, and none for the others.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+
+ <section>
+ <title>Configuring filters</title>
+
+ <para>
+ Filters are plugins which modify an audio stream.
+ </para>
+
+ <para>
+ To configure a filter, add a <varname>filter</varname> block
+ to <filename>mpd.conf</filename>:
+ </para>
+
+ <programlisting>filter {
+ plugin "volume"
+ name "software volume"
+}
+ </programlisting>
+
+ <para>
+ The following table lists the <varname>filter</varname>
+ options valid for all plugins:
+ </para>
+
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>
+ Name
+ </entry>
+ <entry>
+ Description
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <varname>plugin</varname>
+ </entry>
+ <entry>
+ The name of the plugin.
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <varname>name</varname>
</entry>
<entry>
- Specifies whether the hardware mixer of this audio
- output should be used. By default, all hardware
- mixers are enabled if available.
+ The name of the filter.
</entry>
</row>
</tbody>