diff options
| author | Max Kellermann <max@duempel.org> | 2014-07-11 21:33:50 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-07-11 21:33:50 +0200 |
| commit | 828cd6fd0b8838edb39e6b3f62397a5fe369e1d5 (patch) | |
| tree | 62bfa8fdaaf846a5a4c18e6607ef8f1e8f13c8a2 /src/command | |
| parent | 681643ea9e6e196c449f1974cd50e1f400da3450 (diff) | |
| parent | ecb67a1ed16e93f5fe552b28631e517060115648 (diff) | |
| download | mpd-828cd6fd0b8838edb39e6b3f62397a5fe369e1d5.tar.gz mpd-828cd6fd0b8838edb39e6b3f62397a5fe369e1d5.tar.xz mpd-828cd6fd0b8838edb39e6b3f62397a5fe369e1d5.zip | |
Merge branch 'v0.18.x'
Diffstat (limited to 'src/command')
| -rw-r--r-- | src/command/DatabaseCommands.cxx | 3 | ||||
| -rw-r--r-- | src/command/PlaylistCommands.cxx | 3 | ||||
| -rw-r--r-- | src/command/QueueCommands.cxx | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx index 70d97a63e..a3ea8d0ae 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 "BulkEdit.hxx" #include <string.h> @@ -106,6 +107,8 @@ handle_match_add(Client &client, unsigned argc, char *argv[], bool fold_case) return CommandResult::ERROR; } + const ScopeBulkEdit bulk_edit(client.partition); + const DatabaseSelection selection("", true, &filter); Error error; return AddFromDatabase(client.partition, selection, error) diff --git a/src/command/PlaylistCommands.cxx b/src/command/PlaylistCommands.cxx index 79bfb44d8..c2b18064c 100644 --- a/src/command/PlaylistCommands.cxx +++ b/src/command/PlaylistCommands.cxx @@ -26,6 +26,7 @@ #include "PlaylistFile.hxx" #include "db/PlaylistVector.hxx" #include "SongLoader.hxx" +#include "BulkEdit.hxx" #include "playlist/PlaylistQueue.hxx" #include "playlist/Print.hxx" #include "queue/Playlist.hxx" @@ -66,6 +67,8 @@ handle_load(Client &client, unsigned argc, char *argv[]) } else if (!check_range(client, &start_index, &end_index, argv[2])) return CommandResult::ERROR; + const ScopeBulkEdit bulk_edit(client.partition); + Error error; const SongLoader loader(client); if (!playlist_open_into_queue(argv[1], diff --git a/src/command/QueueCommands.cxx b/src/command/QueueCommands.cxx index 0d0cff5cf..1ff7a732b 100644 --- a/src/command/QueueCommands.cxx +++ b/src/command/QueueCommands.cxx @@ -28,6 +28,7 @@ #include "PlaylistPrint.hxx" #include "client/Client.hxx" #include "Partition.hxx" +#include "BulkEdit.hxx" #include "protocol/ArgParser.hxx" #include "protocol/Result.hxx" #include "ls.hxx" @@ -74,6 +75,8 @@ handle_add(Client &client, gcc_unused unsigned argc, char *argv[]) } #ifdef ENABLE_DATABASE + const ScopeBulkEdit bulk_edit(client.partition); + const DatabaseSelection selection(uri, true); Error error; return AddFromDatabase(client.partition, selection, error) |