Merge tag 'release-0.17.5'

src/PlaylistCommands.cxx

@@ -193,7 +193,7 @@ handle_playlistadd(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 = search_add_to_playlist(uri, playlist, nullptr,
 						 &error);

src/PlaylistEdit.cxx

@@ -342,7 +342,12 @@ playlist::MoveRange(player_control &pc, unsigned start, unsigned end, int to)
 	 * (-playlist.length == to) => move to position BEFORE current song
 	 */
 	const int currentSong = GetCurrentPosition();
-	if (to < 0 && currentSong >= 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;

src/SongUpdate.cxx

@@ -173,7 +173,7 @@ Song::UpdateFileInArchive()
 	if (suffix == NULL)
 		return false;
 
-	plugin = decoder_plugin_from_suffix(suffix, nullptr);
+	plugin = decoder_plugin_from_suffix(suffix, NULL);
 	if (plugin == NULL)
 		return false;
 

src/decoder/FfmpegDecoderPlugin.cxx

@@ -586,6 +586,7 @@ static const char *const ffmpeg_suffixes[] = {
 };
 
 static const char *const ffmpeg_mime_types[] = {
+	"application/flv",
 	"application/m4a",
 	"application/mp4",
 	"application/octet-stream",

src/decoder/MikmodDecoderPlugin.cxx

@@ -199,7 +199,11 @@ mikmod_decoder_scan_file(const char *path_fs,
 	if (title != nullptr) {
 		tag_handler_invoke_tag(handler, handler_ctx,
 				       TAG_TITLE, title);
+#if (LIBMIKMOD_VERSION >= 0x030200)
+		MikMod_free(title);
+#else
 		free(title);
+#endif
 	}
 
 	return true;