aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-09-10 23:18:43 +0200
committerMax Kellermann <max@duempel.org>2009-09-10 23:18:43 +0200
commitfdc479676f7f39d33287111900f0862ddb7797af (patch)
tree9b77638e323b14e8b5cba3fd002ac2d7c580e06a
parent4cdf62000c2d5403f0dc5a5078719c2d63d268c7 (diff)
parent985b8b2d7159a47d1dd1d3604d6b8f6edc94d2e7 (diff)
downloadmpd-fdc479676f7f39d33287111900f0862ddb7797af.tar.gz
mpd-fdc479676f7f39d33287111900f0862ddb7797af.tar.xz
mpd-fdc479676f7f39d33287111900f0862ddb7797af.zip
Merge branch 'v0.15.x'
Conflicts: NEWS configure.ac doc/mpdconf.example
-rw-r--r--NEWS5
-rw-r--r--doc/mpdconf.example44
-rw-r--r--doc/protocol.xml21
-rwxr-xr-xsrc/decoder/vorbis_plugin.c2
4 files changed, 36 insertions, 36 deletions
diff --git a/NEWS b/NEWS
index aa637d5b4..8f8aa3de6 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,11 @@ ver 0.16 (20??/??/??)
* obey $(sysconfdir) for default mpd.conf location
+ver 0.15.4 (2009/??/??)
+* decoders:
+ - vorbis: revert "faster tag scanning with ov_test_callback()"
+
+
ver 0.15.3 (2009/08/29)
* decoders:
- vorbis: faster tag scanning with ov_test_callback()
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 8ce3a1b9f..2d2732869 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -184,12 +184,12 @@ input {
#audio_output {
# type "alsa"
# 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
+## 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
#}
#
# An example of an OSS output:
@@ -197,11 +197,11 @@ input {
#audio_output {
# type "oss"
# 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
+## device "/dev/dsp" # optional
+## format "44100:16:2" # optional
+## mixer_type "hardware" # optional
+## mixer_device "/dev/mixer" # optional
+## mixer_control "PCM" # optional
#}
#
# An example of a shout output (for streaming to Icecast):
@@ -217,13 +217,13 @@ input {
# quality "5.0"
# bitrate "128"
# format "44100:16:1"
-# protocol "icecast2" # optional
-# user "source" # optional
-# description "My Stream Description" # optional
-# genre "jazz" # optional
-# public "no" # optional
-# timeout "2" # optional
-# mixer_type "software" # optional
+## protocol "icecast2" # optional
+## user "source" # optional
+## description "My Stream Description" # optional
+## genre "jazz" # optional
+## public "no" # optional
+## timeout "2" # optional
+## mixer_type "software" # optional
#}
#
# An example of a recorder output:
@@ -233,7 +233,7 @@ input {
# name "My recorder"
# encoder "vorbis" # optional, vorbis or lame
# path "/var/lib/mpd/recorder/mpd.ogg"
-# quality "5.0" # do not define if bitrate is defined
+## quality "5.0" # do not define if bitrate is defined
# bitrate "128" # do not define if quality is defined
# format "44100:16:1"
#}
@@ -245,7 +245,7 @@ input {
# name "My HTTP Stream"
# encoder "vorbis" # optional, vorbis or lame
# port "8000"
-# quality "5.0" # do not define if bitrate is defined
+## quality "5.0" # do not define if bitrate is defined
# bitrate "128" # do not define if quality is defined
# format "44100:16:1"
#}
@@ -255,8 +255,8 @@ input {
#audio_output {
# type "pulse"
# name "My Pulse Output"
-# server "remote_server" # optional
-# sink "remote_server_sink" # optional
+## server "remote_server" # optional
+## sink "remote_server_sink" # optional
#}
#
## Example "pipe" output:
diff --git a/doc/protocol.xml b/doc/protocol.xml
index 30f8792c8..922d27676 100644
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
@@ -1224,29 +1224,24 @@ OK
<term>
<cmdsynopsis>
<command>update</command>
- <arg><replaceable>URI</replaceable></arg>
+ <arg choice="opt"><replaceable>URI</replaceable></arg>
</cmdsynopsis>
</term>
<listitem>
<para>
- Updates the music database.
+ Updates the music database: find new files, remove
+ deleted files, update modified files.
</para>
<para>
<varname>URI</varname> is a particular directory or
- song/file to update.
+ song/file to update. If you do not specify it,
+ everything is updated.
</para>
<para>
Prints "updating_db: JOBID" where
- <varname>JOBID</varname> is the job id requested for
- your update, and is displayed in status, while the
- requested update is happening.
- </para>
- <para>
- To update a number of paths/songs at once, use
- command_list, it will be much more faster/efficient.
- Also, if you use a command_list for updating, only one
- <command>update</command> job id will be returned per
- sequence of updates.
+ <varname>JOBID</varname> is a positive number
+ identifying the update job. You can read the current
+ job id in the <command>status</command> response.
</para>
</listitem>
</varlistentry>
diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c
index 4548d1b57..39a075176 100755
--- a/src/decoder/vorbis_plugin.c
+++ b/src/decoder/vorbis_plugin.c
@@ -382,7 +382,7 @@ vorbis_tag_dup(const char *file)
return NULL;
}
- if (ov_test_callbacks(fp, &vf, NULL, 0, OV_CALLBACKS_STREAMONLY) < 0) {
+ if (ov_open(fp, &vf, NULL, 0) < 0) {
fclose(fp);
return NULL;
}