aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/mpdconf.example26
-rw-r--r--doc/protocol.xml45
-rw-r--r--doc/user.xml64
3 files changed, 106 insertions, 29 deletions
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 4b55f8801..7a2db5d16 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -385,29 +385,3 @@ input {
#id3v1_encoding "ISO-8859-1"
#
###############################################################################
-
-
-# SIDPlay decoder #############################################################
-#
-# songlength_database:
-# Location of your songlengths file, as distributed with the HVSC.
-# The sidplay plugin checks this for matching MD5 fingerprints.
-# See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq
-#
-# default_songlength:
-# This is the default playing time in seconds for songs not in the
-# songlength database, or in case you're not using a database.
-# A value of 0 means play indefinitely.
-#
-# filter:
-# Turns the SID filter emulation on or off.
-#
-#decoder {
-# plugin "sidplay"
-# songlength_database "/media/C64Music/DOCUMENTS/Songlengths.txt"
-# default_songlength "120"
-# filter "true"
-#}
-#
-###############################################################################
-
diff --git a/doc/protocol.xml b/doc/protocol.xml
index 05468e535..d56b09fdd 100644
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
@@ -240,7 +240,8 @@
bigger than the priority of the current song. Decreasing the
priority of a song will moved it farther to the end of the
sequence. Changing the priority of the current song has no
- effect on the sequence.
+ effect on the sequence. During playback, a song's priority is
+ reset to zero.
</para>
</section>
</chapter>
@@ -517,6 +518,15 @@
</listitem>
<listitem>
<para>
+ <varname>duration</varname>:
+ <footnote id="since_0_20"><simpara>Introduced with <application>MPD</application> 0.20</simpara></footnote>
+ <returnvalue>
+ Duration of the current song in seconds.
+ </returnvalue>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<varname>bitrate</varname>:
<returnvalue>instantaneous bitrate in
kbps</returnvalue>
@@ -1559,6 +1569,7 @@ OK
<arg choice="req"><replaceable>TYPE</replaceable></arg>
<arg choice="req"><replaceable>WHAT</replaceable></arg>
<arg choice="opt"><replaceable>...</replaceable></arg>
+ <arg choice="opt">window <replaceable>START</replaceable>:<replaceable>END</replaceable></arg>
</cmdsynopsis>
</term>
<listitem>
@@ -1603,6 +1614,13 @@ OK
<para>
<varname>WHAT</varname> is what to find.
</para>
+
+ <para>
+ <varname>window</varname> can be used to query only a
+ portion of the real response. The parameter is two
+ zero-based record numbers; a start number and an end
+ number.
+ </para>
</listitem>
</varlistentry>
<varlistentry id="command_findadd">
@@ -1795,6 +1813,7 @@ OK
<arg choice="req"><replaceable>TYPE</replaceable></arg>
<arg choice="req"><replaceable>WHAT</replaceable></arg>
<arg choice="opt"><replaceable>...</replaceable></arg>
+ <arg choice="opt">window <replaceable>START</replaceable>:<replaceable>END</replaceable></arg>
</cmdsynopsis>
</term>
<listitem>
@@ -2119,6 +2138,30 @@ OK
</para>
</listitem>
</varlistentry>
+
+ <varlistentry id="command_sticker_find_equals">
+ <term>
+ <cmdsynopsis>
+ <command>sticker</command>
+ <arg choice="plain">find</arg>
+ <arg choice="req"><replaceable>TYPE</replaceable></arg>
+ <arg choice="req"><replaceable>URI</replaceable></arg>
+ <arg choice="req"><replaceable>NAME</replaceable></arg>
+ <arg choice="plain">=</arg>
+ <arg choice="req"><replaceable>VALUE</replaceable></arg>
+ </cmdsynopsis>
+ </term>
+ <listitem>
+ <para>
+ Searches for stickers with the given value.
+ </para>
+
+ <para>
+ Other supported operators are:
+ "<function>&lt;</function>", "<function>&gt;</function>"
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</section>
diff --git a/doc/user.xml b/doc/user.xml
index a0bd861e8..e5b89e27d 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -574,7 +574,7 @@ systemctl start mpd.socket</programlisting>
<row>
<entry>
<varname>mixer_type</varname>
- <parameter>hardware|software|none</parameter>
+ <parameter>hardware|software|null|none</parameter>
</entry>
<entry>
Specifies which mixer should be used for this audio
@@ -582,7 +582,9 @@ systemctl start mpd.socket</programlisting>
linkend="alsa_output">ALSA</link>, <link
linkend="oss_output">OSS</link> and <link
linkend="pulse_output">PulseAudio</link>), the
- software mixer or no mixer
+ software mixer, the "null" mixer
+ (<parameter>null</parameter>; allows setting the
+ volume, but with no effect) or no mixer
(<parameter>none</parameter>). By default, the
hardware mixer is used for devices which support it,
and none for the others.
@@ -2017,6 +2019,64 @@ buffer_size: 16384</programlisting>
</informaltable>
</section>
+ <section id="sidplay_decoder">
+ <title><varname>sidplay</varname></title>
+
+ <para>
+ C64 SID decoder based on
+ <application>libsidplay</application>.
+ </para>
+
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Setting</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <varname>songlength_database</varname>
+ <parameter>PATH</parameter>
+ </entry>
+ <entry>
+ Location of your songlengths file, as distributed
+ with the HVSC. The <varname>sidplay</varname>
+ plugin checks this for matching MD5 fingerprints.
+ See <ulink
+ url="http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq">http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq</ulink>.
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <varname>default_songlength</varname>
+ <parameter>SECONDS</parameter>
+ </entry>
+ <entry>
+ This is the default playing time in seconds for
+ songs not in the songlength database, or in case
+ you're not using a database. A value of 0 means
+ play indefinitely.
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <varname>filter</varname>
+ <parameter>yes|no</parameter>
+ </entry>
+ <entry>
+ Turns the SID filter emulation on or off.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
+
<section>
<title><varname>wildmidi</varname></title>