From e8569af35f5c346a86a2f0dcd4090ac919ac5543 Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sat, 29 Aug 2009 22:59:24 -0700 Subject: [PATCH 1/4] Modify version string to post-release version 0.15.4~git --- NEWS | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 2c79c6639..34a3d3858 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +ver 0.15.4 (2009/??/??) + + ver 0.15.3 (2009/08/29) * decoders: - vorbis: faster tag scanning with ov_test_callback() diff --git a/configure.ac b/configure.ac index 665f19b31..822bf10a2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.15.3, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.15.4~git, musicpd-dev-team@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2]) AM_CONFIG_HEADER(config.h) From a99202a8a4ebda1fcbedb3b024cab3b25c63adad Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 10 Sep 2009 23:04:01 +0200 Subject: [PATCH 2/4] decoder/vorbis: revert "faster tag scanning with ov_test_callback()" This patch made ov_time_total() unusable, and MPD did not know the duration of songs. --- NEWS | 2 ++ src/decoder/vorbis_plugin.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 34a3d3858..47da1a03f 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.15.4 (2009/??/??) +* decoders: + - vorbis: revert "faster tag scanning with ov_test_callback()" ver 0.15.3 (2009/08/29) diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c index 81950eb22..d4f81e91f 100644 --- a/src/decoder/vorbis_plugin.c +++ b/src/decoder/vorbis_plugin.c @@ -383,7 +383,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; } From c97bccad0194e8cb0806316ae4979aefa36d2b66 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 10 Sep 2009 23:10:23 +0200 Subject: [PATCH 3/4] doc/mpdconf.example: additional comment signs for some parameters Add a second column of comment signs on some parameters which users shouldn't usually set, unless they know what they're doing. --- doc/mpdconf.example | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/mpdconf.example b/doc/mpdconf.example index 919326236..11b14bd93 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -177,11 +177,11 @@ input { #audio_output { # type "alsa" # name "My ALSA Device" -# device "hw:0,0" # optional -# format "44100:16:2" # optional -# mixer_device "default" # optional -# mixer_control "PCM" # optional -# mixer_index "0" # optional +## device "hw:0,0" # optional +## format "44100:16:2" # optional +## mixer_device "default" # optional +## mixer_control "PCM" # optional +## mixer_index "0" # optional #} # # An example of an OSS output: @@ -189,10 +189,10 @@ input { #audio_output { # type "oss" # name "My OSS Device" -# device "/dev/dsp" # optional -# format "44100:16:2" # optional -# mixer_device "/dev/mixer" # optional -# mixer_control "PCM" # optional +## device "/dev/dsp" # optional +## format "44100:16:2" # optional +## mixer_device "/dev/mixer" # optional +## mixer_control "PCM" # optional #} # # An example of a shout output (for streaming to Icecast): @@ -208,12 +208,12 @@ 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 +## protocol "icecast2" # optional +## user "source" # optional +## description "My Stream Description" # optional +## genre "jazz" # optional +## public "no" # optional +## timeout "2" # optional #} # # An example of a httpd output (built-in HTTP streaming server): @@ -223,7 +223,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" #} @@ -233,8 +233,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: From 985b8b2d7159a47d1dd1d3604d6b8f6edc94d2e7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 10 Sep 2009 19:54:15 +0200 Subject: [PATCH 4/4] doc/protocol: clarify "update" The update job id is positive. When used in a command list, MPD prints one job id for each "update" command. --- doc/protocol.xml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/doc/protocol.xml b/doc/protocol.xml index 5418ea8f8..2bc7d55ae 100644 --- a/doc/protocol.xml +++ b/doc/protocol.xml @@ -1210,29 +1210,24 @@ OK update - URI + URI - Updates the music database. + Updates the music database: find new files, remove + deleted files, update modified files. URI is a particular directory or - song/file to update. + song/file to update. If you do not specify it, + everything is updated. Prints "updating_db: JOBID" where - JOBID is the job id requested for - your update, and is displayed in status, while the - requested update is happening. - - - 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 - update job id will be returned per - sequence of updates. + JOBID is a positive number + identifying the update job. You can read the current + job id in the status response.