5 files changed, 40 insertions, 1 deletions
diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx
index 6a4b18198..be3a343a5 100644
--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@@ -210,6 +210,16 @@ command_available(gcc_unused const Partition &partition,
 		return neighbor_commands_available(partition.instance);
 #endif
 
+	if (strcmp(cmd->cmd, "save") == 0 ||
+	    strcmp(cmd->cmd, "rm") == 0 ||
+	    strcmp(cmd->cmd, "rename") == 0 ||
+	    strcmp(cmd->cmd, "playlistdelete") == 0 ||
+	    strcmp(cmd->cmd, "playlistmove") == 0 ||
+	    strcmp(cmd->cmd, "playlistclear") == 0 ||
+	    strcmp(cmd->cmd, "playlistadd") == 0 ||
+	    strcmp(cmd->cmd, "listplaylists") == 0)
+		return playlist_commands_available();
+
 	return true;
 }
 
diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx
index a3ea8d0ae..988542f44 100644
--- a/src/command/DatabaseCommands.cxx
+++ b/src/command/DatabaseCommands.cxx
@@ -32,6 +32,7 @@
 #include "util/Error.hxx"
 #include "SongFilter.hxx"
 #include "protocol/Result.hxx"
+#include "protocol/ArgParser.hxx"
 #include "BulkEdit.hxx"
 
 #include <string.h>
@@ -70,6 +71,16 @@ handle_match(Client &client, unsigned argc, char *argv[], bool fold_case)
 {
 	ConstBuffer<const char *> args(argv + 1, argc - 1);
 
+	unsigned window_start = 0, window_end = std::numeric_limits<int>::max();
+	if (args.size >= 2 && strcmp(args[args.size - 2], "window") == 0) {
+		if (!check_range(client, &window_start, &window_end,
+				 args.back()))
+			return CommandResult::ERROR;
+
+		args.pop_back();
+		args.pop_back();
+	}
+
 	SongFilter filter;
 	if (!filter.Parse(args, fold_case)) {
 		command_error(client, ACK_ERROR_ARG, "incorrect arguments");
@@ -79,7 +90,8 @@ handle_match(Client &client, unsigned argc, char *argv[], bool fold_case)
 	const DatabaseSelection selection("", true, &filter);
 
 	Error error;
-	return db_selection_print(client, selection, true, false, error)
+	return db_selection_print(client, selection, true, false,
+				  window_start, window_end, error)
 		? CommandResult::OK
 		: print_error(client, error);
 }
diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx
index cd7f42289..a320fb6ba 100644
--- a/src/command/PlayerCommands.cxx
+++ b/src/command/PlayerCommands.cxx
@@ -182,6 +182,10 @@ handle_status(Client &client,
 			      player_status.elapsed_time.ToDoubleS(),
 			      player_status.bit_rate);
 
+		if (!player_status.total_time.IsNegative())
+			client_printf(client, "duration: %1.3f\n",
+				      player_status.total_time.ToDoubleS());
+
 		if (player_status.audio_format.IsDefined()) {
 			struct audio_format_string af_string;
 
diff --git a/src/command/PlaylistCommands.cxx b/src/command/PlaylistCommands.cxx
index c2b18064c..593eab865 100644
--- a/src/command/PlaylistCommands.cxx
+++ b/src/command/PlaylistCommands.cxx
@@ -35,9 +35,17 @@
 #include "protocol/ArgParser.hxx"
 #include "protocol/Result.hxx"
 #include "ls.hxx"
+#include "Mapper.hxx"
+#include "fs/AllocatedPath.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
 
+bool
+playlist_commands_available()
+{
+	return !map_spl_path().IsNull();
+}
+
 static void
 print_spl_list(Client &client, const PlaylistVector &list)
 {
diff --git a/src/command/PlaylistCommands.hxx b/src/command/PlaylistCommands.hxx
index fba4e1318..6dc589c8b 100644
--- a/src/command/PlaylistCommands.hxx
+++ b/src/command/PlaylistCommands.hxx
@@ -21,9 +21,14 @@
 #define MPD_PLAYLIST_COMMANDS_HXX
 
 #include "CommandResult.hxx"
+#include "Compiler.h"
 
 class Client;
 
+gcc_const
+bool
+playlist_commands_available();
+
 CommandResult
 handle_save(Client &client, unsigned argc, char *argv[]);