oysteikt/mpd
oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.15.x'

Browse Source 
Conflicts:
	NEWS
	configure.ac
	doc/mpdconf.example
This commit is contained in:
Max Kellermann 2009-09-10 23:18:43 +02:00
commit fdc479676f
4 changed files with 36 additions and 36 deletions

5
NEWS

@ -36,6 +36,11 @@ ver 0.16 (20??/??/??)
* obey $(sysconfdir) for default mpd.conf location * 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) ver 0.15.3 (2009/08/29)
* decoders: * decoders:
- vorbis: faster tag scanning with ov_test_callback() - vorbis: faster tag scanning with ov_test_callback()

44
doc/mpdconf.example

@ -184,12 +184,12 @@ input {
#audio_output { #audio_output {
# type "alsa" # type "alsa"
# name "My ALSA Device" # name "My ALSA Device"
# device "hw:0,0" # optional ## device "hw:0,0" # optional
# format "44100:16:2" # optional ## format "44100:16:2" # optional
# mixer_type "hardware" # optional ## mixer_type "hardware" # optional
# mixer_device "default" # optional ## mixer_device "default" # optional
# mixer_control "PCM" # optional ## mixer_control "PCM" # optional
# mixer_index "0" # optional ## mixer_index "0" # optional
#} #}
# #
# An example of an OSS output: # An example of an OSS output:
@ -197,11 +197,11 @@ input {
#audio_output { #audio_output {
# type "oss" # type "oss"
# name "My OSS Device" # name "My OSS Device"
# device "/dev/dsp" # optional ## device "/dev/dsp" # optional
# format "44100:16:2" # optional ## format "44100:16:2" # optional
# mixer_type "hardware" # optional ## mixer_type "hardware" # optional
# mixer_device "/dev/mixer" # optional ## mixer_device "/dev/mixer" # optional
# mixer_control "PCM" # optional ## mixer_control "PCM" # optional
#} #}
# #
# An example of a shout output (for streaming to Icecast): # An example of a shout output (for streaming to Icecast):
@ -217,13 +217,13 @@ input {
# quality "5.0" # quality "5.0"
# bitrate "128" # bitrate "128"
# format "44100:16:1" # format "44100:16:1"
# protocol "icecast2" # optional ## protocol "icecast2" # optional
# user "source" # optional ## user "source" # optional
# description "My Stream Description" # optional ## description "My Stream Description" # optional
# genre "jazz" # optional ## genre "jazz" # optional
# public "no" # optional ## public "no" # optional
# timeout "2" # optional ## timeout "2" # optional
# mixer_type "software" # optional ## mixer_type "software" # optional
#} #}
# #
# An example of a recorder output: # An example of a recorder output:
@ -233,7 +233,7 @@ input {
# name "My recorder" # name "My recorder"
# encoder "vorbis" # optional, vorbis or lame # encoder "vorbis" # optional, vorbis or lame
# path "/var/lib/mpd/recorder/mpd.ogg" # 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 # bitrate "128" # do not define if quality is defined
# format "44100:16:1" # format "44100:16:1"
#} #}
@ -245,7 +245,7 @@ input {
# name "My HTTP Stream" # name "My HTTP Stream"
# encoder "vorbis" # optional, vorbis or lame # encoder "vorbis" # optional, vorbis or lame
# port "8000" # 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 # bitrate "128" # do not define if quality is defined
# format "44100:16:1" # format "44100:16:1"
#} #}
@ -255,8 +255,8 @@ input {
#audio_output { #audio_output {
# type "pulse" # type "pulse"
# name "My Pulse Output" # name "My Pulse Output"
# server "remote_server" # optional ## server "remote_server" # optional
# sink "remote_server_sink" # optional ## sink "remote_server_sink" # optional
#} #}
# #
## Example "pipe" output: ## Example "pipe" output:

21
doc/protocol.xml

@ -1224,29 +1224,24 @@ OK
<term> <term>
<cmdsynopsis> <cmdsynopsis>
<command>update</command> <command>update</command>
<arg><replaceable>URI</replaceable></arg> <arg choice="opt"><replaceable>URI</replaceable></arg>
</cmdsynopsis> </cmdsynopsis>
</term> </term>
<listitem> <listitem>
<para> <para>
Updates the music database. Updates the music database: find new files, remove
deleted files, update modified files.
</para> </para>
<para> <para>
<varname>URI</varname> is a particular directory or <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>
<para> <para>
Prints "updating_db: JOBID" where Prints "updating_db: JOBID" where
<varname>JOBID</varname> is the job id requested for <varname>JOBID</varname> is a positive number
your update, and is displayed in status, while the identifying the update job. You can read the current
requested update is happening. job id in the <command>status</command> response.
</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.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

2
src/decoder/vorbis_plugin.c

@ -382,7 +382,7 @@ vorbis_tag_dup(const char *file)
return NULL; return NULL;
} }
if (ov_test_callbacks(fp, &vf, NULL, 0, OV_CALLBACKS_STREAMONLY) < 0) { if (ov_open(fp, &vf, NULL, 0) < 0) {
fclose(fp); fclose(fp);
return NULL; return NULL;
} }