[Pkg-mpd-commits] [pkg-mpd] 03/08: Imported Upstream version 0.17.5

Florian Schlichting fsfs at alioth.debian.org
Fri Aug 9 12:42:40 UTC 2013


This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit a280e767619e33380cabe07305b6f81eab3f5316
Author: Florian Schlichting <fsfs at debian.org>
Date:   Fri Aug 9 14:22:08 2013 +0200

    Imported Upstream version 0.17.5
---
 Makefile.in                         |    2 +-
 NEWS                                |   11 +++-
 configure                           |  121 +++++++++++++++++++++++++++++++----
 configure.ac                        |   11 +++-
 doc/doxygen.conf                    |    2 +-
 doc/mpd.conf.5                      |   30 ++++-----
 scripts/makedist.sh                 |   25 --------
 scripts/mpd-indent.sh               |    6 --
 scripts/test.sh                     |   93 ---------------------------
 src/command.c                       |    2 +-
 src/conf.c                          |    2 +-
 src/decoder/ffmpeg_decoder_plugin.c |    1 +
 src/decoder/mikmod_decoder_plugin.c |    4 ++
 src/playlist_edit.c                 |    7 +-
 src/song_update.c                   |    2 +-
 src/update_song.c                   |    2 +-
 16 files changed, 159 insertions(+), 162 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 169449a..f28f7d5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -290,7 +290,6 @@ CONFIG_CLEAN_FILES = src/win/mpd_win32_rc.rc doc/doxygen.conf \
 	mpd.service
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_ at AM_V@)
 am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
@@ -1426,6 +1425,7 @@ AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AO_CFLAGS = @AO_CFLAGS@
 AO_LIBS = @AO_LIBS@
+AR = @AR@
 AUDIOFILE_CFLAGS = @AUDIOFILE_CFLAGS@
 AUDIOFILE_LIBS = @AUDIOFILE_LIBS@
 AUTOCONF = @AUTOCONF@
diff --git a/NEWS b/NEWS
index 1f850ea..f7c4551 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+ver 0.17.5 (2013/08/04)
+* protocol:
+  - 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"
+
 ver 0.17.4 (2013/04/08)
 * protocol:
   - allow to omit END in ranges (START:END)
@@ -9,7 +19,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 b/configure
index 5b8ff4c..c663f9b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mpd 0.17.4.
+# Generated by GNU Autoconf 2.69 for mpd 0.17.5.
 #
 # Report bugs to <musicpd-dev-team at lists.sourceforge.net>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mpd'
 PACKAGE_TARNAME='mpd'
-PACKAGE_VERSION='0.17.4'
-PACKAGE_STRING='mpd 0.17.4'
+PACKAGE_VERSION='0.17.5'
+PACKAGE_STRING='mpd 0.17.5'
 PACKAGE_BUGREPORT='musicpd-dev-team at lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -882,6 +882,7 @@ systemdsystemunitdir
 PKG_CONFIG
 HAVE_CXX_FALSE
 HAVE_CXX_TRUE
+AR
 RANLIB
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
@@ -1669,7 +1670,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mpd 0.17.4 to adapt to many kinds of systems.
+\`configure' configures mpd 0.17.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1739,7 +1740,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mpd 0.17.4:";;
+     short | recursive ) echo "Configuration of mpd 0.17.5:";;
    esac
   cat <<\_ACEOF
 
@@ -2032,7 +2033,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mpd configure 0.17.4
+mpd configure 0.17.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2542,7 +2543,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mpd $as_me 0.17.4, which was
+It was created by mpd $as_me 0.17.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3364,7 +3365,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mpd'
- VERSION='0.17.4'
+ VERSION='0.17.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5087,6 +5088,102 @@ else
 fi
 
 
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+
 HAVE_CXX=yes
 if test x$CXX = xg++; then
 	# CXX=g++ probably means that autoconf hasn't found any C++
@@ -13962,7 +14059,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 &&
@@ -13971,7 +14068,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
 
 		as_fn_error $? "No Audio Output types configured!" "$LINENO" 5
 fi
@@ -16579,7 +16676,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mpd $as_me 0.17.4, which was
+This file was extended by mpd $as_me 0.17.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16645,7 +16742,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mpd config.status 0.17.4
+mpd config.status 0.17.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index fc8cc21..fa2ec19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.60)
 
-AC_INIT(mpd, 0.17.4, musicpd-dev-team at lists.sourceforge.net)
+AC_INIT(mpd, 0.17.5, musicpd-dev-team at lists.sourceforge.net)
 
 VERSION_MAJOR=0
 VERSION_MINOR=17
@@ -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++
@@ -1453,7 +1458,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 +1467,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
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index bd89ea4..80b36f9 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -31,7 +31,7 @@ PROJECT_NAME           = MPD
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 0.17.4
+PROJECT_NUMBER = 0.17.5
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 59d5e62..62f5565 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -29,29 +29,18 @@ See \fBdocs/mpdconf.example\fP in the source tarball for an example
 configuration file.
 .SH REQUIRED PARAMETERS
 .TP
-.B follow_outside_symlinks <yes or no>
-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 <yes or no>
-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 <file>
 This specifies where the db file will be stored.
 .TP
-.B sticker_file <file>
-The location of the sticker database.  This is a database which
-manages dynamic information attached to songs.
-.TP
 .B log_file <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 <file>
+The location of the sticker database.  This is a database which
+manages dynamic information attached to songs.
+.TP
 .B pid_file <file>
 This specifies the file to save mpd's process ID in.
 .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 <yes or no>
+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 <yes or no>
+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 <yes or no>
 If yes, and MPD has been compiled with support for Avahi or Bonjour, service
 information will be published with Zeroconf.  The default is yes.
diff --git a/scripts/makedist.sh b/scripts/makedist.sh
deleted file mode 100755
index 7f8624d..0000000
--- a/scripts/makedist.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-PWD=`pwd`
-
-## If we're not in the scripts directory
-## assume the base directory.
-if test "`basename $PWD`" = "scripts"; then
-	cd ../
-else
-	MYOLDPWD=`pwd`
-	cd `dirname $0`/../
-fi
-
-if test -e Makefile
-then
-	make distclean
-fi
-./autogen.sh
-make
-make dist
-
-if test "`basename $PWD`" = "scripts"; then
-	cd contrib/
-else
-	cd $MYOLDPWD
-fi
diff --git a/scripts/mpd-indent.sh b/scripts/mpd-indent.sh
deleted file mode 100755
index 0bf5418..0000000
--- a/scripts/mpd-indent.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs -cdw -cd0 -c0 -cp0 "$@"
-
-# there doesn't seem to be an indent switch for this, but this
-# forces goto labels to the left-most column, without indentation
-perl -i -p -e 's/^\s+(\w+):/$1:/g unless /^\s+default:/' "$@"
diff --git a/scripts/test.sh b/scripts/test.sh
deleted file mode 100755
index 739a8a6..0000000
--- a/scripts/test.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh -e
-#
-# This shell script tests the build of MPD with various compile-time
-# options.
-#
-# Author: Max Kellermann <max at duempel.org>
-
-PREFIX=/tmp/mpd
-rm -rf $PREFIX
-
-test "x$MAKE" != x || MAKE=make
-
-export CFLAGS="-Os"
-
-test -x configure || NOCONFIGURE=1 ./autogen.sh
-
-# all features on
-./configure --prefix=$PREFIX/full \
-    --disable-dependency-tracking --enable-debug --enable-werror \
-    --enable-un \
-    --enable-modplug \
-    --enable-ao --enable-mikmod --enable-mvp
-$MAKE install
-$MAKE distclean
-
-# no UN, no oggvorbis, no flac, enable oggflac
-./configure --prefix=$PREFIX/small \
-    --disable-dependency-tracking --enable-debug --enable-werror \
-    --disable-un \
-    --disable-flac --disable-vorbis --enable-oggflac
-$MAKE install
-$MAKE distclean
-
-# strip down (disable TCP, disable nearly all plugins)
-CFLAGS="$CFLAGS -DNDEBUG" \
-./configure --prefix=$PREFIX/tiny \
-    --disable-dependency-tracking --disable-debug --enable-werror \
-    --disable-tcp \
-    --disable-curl \
-    --disable-id3 --disable-lsr \
-    --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
-    --disable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
-    --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
-    --disable-flac --disable-vorbis --disable-oggflac --disable-audiofile \
-    --disable-cue \
-    --with-zeroconf=no
-$MAKE install
-$MAKE distclean
-
-# shout: ogg without mp3
-# sndfile instead of modplug
-./configure --prefix=$PREFIX/shout_ogg \
-    --disable-dependency-tracking --disable-debug --enable-werror \
-    --disable-tcp \
-    --disable-curl \
-    --disable-id3 --disable-lsr \
-    --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
-    --enable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
-    --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
-    --disable-flac --enable-vorbis --disable-oggflac --disable-audiofile \
-    --disable-modplug --enable-sndfile \
-    --with-zeroconf=no
-$MAKE install
-$MAKE distclean
-
-# shout: mp3 without ogg
-./configure --prefix=$PREFIX/shout_mp3 \
-    --disable-dependency-tracking --disable-debug --enable-werror \
-    --disable-tcp \
-    --disable-curl \
-    --disable-id3 --disable-lsr \
-    --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
-    --disable-shout-ogg --enable-shout-mp3 --enable-lame-encoder \
-    --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
-    --disable-flac --disable-vorbis --disable-oggflac --disable-audiofile \
-    --with-zeroconf=no
-$MAKE install
-$MAKE distclean
-
-# oggvorbis + oggflac
-./configure --prefix=$PREFIX/oggvorbisflac \
-    --disable-dependency-tracking --disable-debug --enable-werror \
-    --disable-tcp \
-    --disable-curl \
-    --disable-id3 --disable-lsr \
-    --disable-mp3 \
-    --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
-    --disable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
-    --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
-    --disable-flac --enable-vorbis --enable-oggflac --disable-audiofile \
-    --with-zeroconf=no
-$MAKE install
-$MAKE distclean
diff --git a/src/command.c b/src/command.c
index 34ec872..b3318c6 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);
 
diff --git a/src/conf.c b/src/conf.c
index 167f2da..a22f2ec 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/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index fcf7507..58bd2f5 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",
diff --git a/src/decoder/mikmod_decoder_plugin.c b/src/decoder/mikmod_decoder_plugin.c
index 5681a7a..a8fe818 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;
diff --git a/src/playlist_edit.c b/src/playlist_edit.c
index d10f494..8042f2f 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;
diff --git a/src/song_update.c b/src/song_update.c
index 37f502a..f9d6b6f 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 1126ad1..f5930d6 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;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git



More information about the Pkg-mpd-commits mailing list