From 9a4c049675910477621528c29f7a87169f5a5942 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 16 Apr 2013 23:17:38 +0200 Subject: prepare 0.17.5 --- NEWS | 3 ++- configure.ac | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 1f850ea7b..c58c0c5b9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +ver 0.17.5 (not yet released) + ver 0.17.4 (2013/04/08) * protocol: - allow to omit END in ranges (START:END) @@ -9,7 +11,6 @@ ver 0.17.4 (2013/04/08) - implement missing "idle" events on output errors * clock: fix build failure - ver 0.17.3 (2013/01/06) * output: - osx: fix pops during playback diff --git a/configure.ac b/configure.ac index fc8cc2177..de0d90a4e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.17.4, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.17.5~git, musicpd-dev-team@lists.sourceforge.net) VERSION_MAJOR=0 VERSION_MINOR=17 -- cgit v1.2.3 From ce7c97b6baac24569d719bbf78d56cd8b422933a Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Tue, 16 Apr 2013 23:17:03 +0200 Subject: doc: mpd.conf.5 wrongly documents parameters as required mpd.conf.5 lists follow_outside_symlinks and follow_inside_symlinks under REQUIRED, yet also documents a default value for these options, which only makes sense if they're not actually required. --- doc/mpd.conf.5 | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index 59d5e623a..e5359f94a 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -29,17 +29,6 @@ See \fBdocs/mpdconf.example\fP in the source tarball for an example configuration file. .SH REQUIRED PARAMETERS .TP -.B follow_outside_symlinks -Control if MPD will follow symbolic links pointing outside the music dir. -You must recreate the database after changing this option. -The default is "yes". -.TP -.B follow_inside_symlinks -Control if MPD will follow symbolic links pointing inside the music dir, -potentially adding duplicates to the database. -You must recreate the database after changing this option. -The default is "yes". -.TP .B db_file This specifies where the db file will be stored. .TP @@ -99,6 +88,17 @@ reports from what address a connection is opened, and when it is closed, and "verbose" records excessive amounts of information for debugging purposes. The default is "default". .TP +.B follow_outside_symlinks +Control if MPD will follow symbolic links pointing outside the music dir. +You must recreate the database after changing this option. +The default is "yes". +.TP +.B follow_inside_symlinks +Control if MPD will follow symbolic links pointing inside the music dir, +potentially adding duplicates to the database. +You must recreate the database after changing this option. +The default is "yes". +.TP .B zeroconf_enabled If yes, and MPD has been compiled with support for Avahi or Bonjour, service information will be published with Zeroconf. The default is yes. -- cgit v1.2.3 From 5dd728d80236c795b86916be3a0b4ad3bbf29a60 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 16 Apr 2013 23:19:44 +0200 Subject: doc: move sticker_file to "optional parameters" --- doc/mpd.conf.5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index e5359f94a..62f5565e1 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -32,15 +32,15 @@ configuration file. .B db_file This specifies where the db file will be stored. .TP -.B sticker_file -The location of the sticker database. This is a database which -manages dynamic information attached to songs. -.TP .B log_file This specifies where the log file should be located. The special value "syslog" makes MPD use the local syslog daemon. .SH OPTIONAL PARAMETERS .TP +.B sticker_file +The location of the sticker database. This is a database which +manages dynamic information attached to songs. +.TP .B pid_file This specifies the file to save mpd's process ID in. .TP -- cgit v1.2.3 From 7d5d95ad53d15df0b42cef9a5230e46b8de40a22 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 Apr 2013 00:40:27 +0200 Subject: configure.ac: fix hidden syntax error --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index de0d90a4e..8cc36302f 100644 --- a/configure.ac +++ b/configure.ac @@ -1453,7 +1453,7 @@ if test x$enable_fifo = xno && test x$enable_httpd_output = xno && test x$enable_jack = xno && - test x$enable_mvp = xno; then + test x$enable_mvp = xno && test x$enable_openal = xno && test x$enable_oss = xno && test x$enable_osx = xno && @@ -1462,7 +1462,7 @@ if test x$enable_recorder_output = xno && test x$enable_shout = xno && test x$enable_solaris_output = xno && - test x$enable_winmm_output = xno && + test x$enable_winmm_output = xno; then AC_MSG_ERROR([No Audio Output types configured!]) fi -- cgit v1.2.3 From 2b579aeb4f6177de619eb02129f780675a5482ff Mon Sep 17 00:00:00 2001 From: Matthias Drochner Date: Mon, 27 May 2013 19:37:35 +0200 Subject: NULL pointer vs bool "false" confusion there are some places in the mpd-0.17.4 sources where a "false" is used instead of a NULL pointer. --- src/conf.c | 2 +- src/song_update.c | 2 +- src/update_song.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf.c b/src/conf.c index 167f2da92..a22f2ec91 100644 --- a/src/conf.c +++ b/src/conf.c @@ -317,7 +317,7 @@ config_read_block(FILE *fp, int *count, char *string, GError **error_r) g_set_error(error_r, config_quark(), 0, "line %i: Unknown tokens after '}'", *count); - return false; + return NULL; } return ret; diff --git a/src/song_update.c b/src/song_update.c index 37f502a20..f9d6b6f46 100644 --- a/src/song_update.c +++ b/src/song_update.c @@ -187,7 +187,7 @@ song_file_update_inarchive(struct song *song) if (suffix == NULL) return false; - plugin = decoder_plugin_from_suffix(suffix, false); + plugin = decoder_plugin_from_suffix(suffix, NULL); if (plugin == NULL) return false; diff --git a/src/update_song.c b/src/update_song.c index 1126ad115..f5930d688 100644 --- a/src/update_song.c +++ b/src/update_song.c @@ -104,7 +104,7 @@ update_song_file(struct directory *directory, const struct stat *st) { const struct decoder_plugin *plugin = - decoder_plugin_from_suffix(suffix, false); + decoder_plugin_from_suffix(suffix, NULL); if (plugin == NULL) return false; -- cgit v1.2.3 From d59a332ef96666d2d7df71d0885f8e652dd6fc1b Mon Sep 17 00:00:00 2001 From: tsufeki Date: Thu, 1 Aug 2013 08:42:22 +0200 Subject: commmand: fix URI argument in playlistadd --- NEWS | 2 ++ src/command.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c58c0c5b9..8ef4f8b75 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.17.5 (not yet released) +* protocol: + - fix "playlistadd" with URI ver 0.17.4 (2013/04/08) * protocol: diff --git a/src/command.c b/src/command.c index 34ec87247..b3318c68b 100644 --- a/src/command.c +++ b/src/command.c @@ -1579,7 +1579,7 @@ handle_playlistadd(struct client *client, G_GNUC_UNUSED int argc, char *argv[]) return COMMAND_RETURN_ERROR; } - success = spl_append_uri(argv[1], playlist, &error); + success = spl_append_uri(uri, playlist, &error); } else success = addAllInToStoredPlaylist(uri, playlist, &error); -- cgit v1.2.3 From dbe04c4207387862db4c7c4484d3f356c4206e35 Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Thu, 1 Aug 2013 09:13:41 +0200 Subject: configure.ac: detect system "ar" --- NEWS | 2 ++ configure.ac | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 8ef4f8b75..7d87ee243 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ ver 0.17.5 (not yet released) * protocol: - fix "playlistadd" with URI +* configure.ac: + - detect system "ar" ver 0.17.4 (2013/04/08) * protocol: diff --git a/configure.ac b/configure.ac index 8cc36302f..fba498714 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,11 @@ AC_PROG_CC_C99 AC_PROG_CXX AC_PROG_RANLIB +AN_MAKEVAR([AR], [AC_PROG_AR]) +AN_PROGRAM([ar], [AC_PROG_AR]) +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) +AC_PROG_AR + HAVE_CXX=yes if test x$CXX = xg++; then # CXX=g++ probably means that autoconf hasn't found any C++ -- cgit v1.2.3 From 363050f44c9aa75b93a2402f0df2f1c5e97c35e9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 1 Aug 2013 09:28:03 +0200 Subject: playlist_edit: fix "move" relative to current when there is no current song Fixes Mantis #3770. --- NEWS | 1 + src/playlist_edit.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 7d87ee243..b302870dc 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ ver 0.17.5 (not yet released) * protocol: - fix "playlistadd" with URI + - fix "move" relative to current when there is no current song * configure.ac: - detect system "ar" diff --git a/src/playlist_edit.c b/src/playlist_edit.c index d10f49451..8042f2f76 100644 --- a/src/playlist_edit.c +++ b/src/playlist_edit.c @@ -396,7 +396,12 @@ playlist_move_range(struct playlist *playlist, struct player_control *pc, ? (int)queue_order_to_position(&playlist->queue, playlist->current) : -1; - if (to < 0 && playlist->current >= 0) { + if (to < 0) { + if (currentSong < 0) + /* can't move relative to current song, + because there is no current song */ + return PLAYLIST_RESULT_BAD_RANGE; + if (start <= (unsigned)currentSong && (unsigned)currentSong < end) /* no-op, can't be moved to offset of itself */ return PLAYLIST_RESULT_SUCCESS; -- cgit v1.2.3 From 7ff988275f9c3487d54c23d55218301aa0111aff Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Sat, 20 Apr 2013 08:29:11 +0200 Subject: decoder/mikmod: use MikMod_free() to free the title on libmikmod-3.2 Player_LoadTitle() returns an aligned pointer in libmikmod-3.2 that cannot be freed with free(). The correct way to do this now is MikMod_free() which extracts the original pointer from the buffer and frees that. Signed-off-by: Christoph Mende --- NEWS | 2 ++ src/decoder/mikmod_decoder_plugin.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/NEWS b/NEWS index b302870dc..6547bde82 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ ver 0.17.5 (not yet released) * protocol: - fix "playlistadd" with URI - fix "move" relative to current when there is no current song +* decoder: + - mikmod: adapt to libmikmod 3.2 * configure.ac: - detect system "ar" diff --git a/src/decoder/mikmod_decoder_plugin.c b/src/decoder/mikmod_decoder_plugin.c index 5681a7a57..a8fe818de 100644 --- a/src/decoder/mikmod_decoder_plugin.c +++ b/src/decoder/mikmod_decoder_plugin.c @@ -200,7 +200,11 @@ mikmod_decoder_scan_file(const char *path_fs, if (title != NULL) { tag_handler_invoke_tag(handler, handler_ctx, TAG_TITLE, title); +#if (LIBMIKMOD_VERSION >= 0x030200) + MikMod_free(title); +#else free(title); +#endif } return true; -- cgit v1.2.3 From 3a34fd181d4bb1d57426d47fd188228ac290aa5d Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Tue, 2 Jul 2013 16:16:46 -0400 Subject: FfmpegDecoderPlugin: add application/flv to mime types list --- NEWS | 1 + src/decoder/ffmpeg_decoder_plugin.c | 1 + 2 files changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 6547bde82..70b479ec9 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ ver 0.17.5 (not yet released) - fix "playlistadd" with URI - fix "move" relative to current when there is no current song * decoder: + - ffmpeg: support "application/flv" - mikmod: adapt to libmikmod 3.2 * configure.ac: - detect system "ar" diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index fcf7507f4..58bd2f54a 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -717,6 +717,7 @@ static const char *const ffmpeg_suffixes[] = { }; static const char *const ffmpeg_mime_types[] = { + "application/flv", "application/m4a", "application/mp4", "application/octet-stream", -- cgit v1.2.3 From d8217c364a182a12fb8abd19732341af1515ffb0 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 4 Aug 2013 14:21:45 +0200 Subject: release 0.17.5 --- NEWS | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 70b479ec9..f7c45514b 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.17.5 (not yet released) +ver 0.17.5 (2013/08/04) * protocol: - fix "playlistadd" with URI - fix "move" relative to current when there is no current song diff --git a/configure.ac b/configure.ac index fba498714..fa2ec19ac 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.17.5~git, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.17.5, musicpd-dev-team@lists.sourceforge.net) VERSION_MAJOR=0 VERSION_MINOR=17 -- cgit v1.2.3