diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-29 19:29:22 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-29 21:13:40 +0100 |
| commit | b5fc21b9f442904608a73e3c705e498c55769843 (patch) | |
| tree | 1d1143f698c28afb77d94343d38245d7a0693dfa /src/command | |
| parent | 44581dbef53ba2ae589cbc8e481285697363941f (diff) | |
| download | mpd-b5fc21b9f442904608a73e3c705e498c55769843.tar.gz mpd-b5fc21b9f442904608a73e3c705e498c55769843.tar.xz mpd-b5fc21b9f442904608a73e3c705e498c55769843.zip | |
Revert "command: new commands "findin", "searchin" with base URI"
This reverts commit a577944ab5a1f4d688e5901fa3efaf7cd1673588.
Will be replaced by new options for the old commands "search" and
"find".
Diffstat (limited to 'src/command')
| -rw-r--r-- | src/command/AllCommands.cxx | 2 | ||||
| -rw-r--r-- | src/command/DatabaseCommands.cxx | 21 | ||||
| -rw-r--r-- | src/command/DatabaseCommands.hxx | 6 |
3 files changed, 4 insertions, 25 deletions
diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx index 94aa9f335..0ab5953d0 100644 --- a/src/command/AllCommands.cxx +++ b/src/command/AllCommands.cxx @@ -91,7 +91,6 @@ static const struct command commands[] = { { "enableoutput", PERMISSION_ADMIN, 1, 1, handle_enableoutput }, { "find", PERMISSION_READ, 2, -1, handle_find }, { "findadd", PERMISSION_READ, 2, -1, handle_findadd}, - { "findin", PERMISSION_READ, 3, -1, handle_find_in }, { "idle", PERMISSION_READ, 0, -1, handle_idle }, { "kill", PERMISSION_ADMIN, -1, -1, handle_kill }, { "list", PERMISSION_READ, 1, -1, handle_list }, @@ -143,7 +142,6 @@ static const struct command commands[] = { { "search", PERMISSION_READ, 2, -1, handle_search }, { "searchadd", PERMISSION_ADD, 2, -1, handle_searchadd }, { "searchaddpl", PERMISSION_CONTROL, 3, -1, handle_searchaddpl }, - { "searchin", PERMISSION_READ, 3, -1, handle_search_in }, { "seek", PERMISSION_CONTROL, 2, 2, handle_seek }, { "seekcur", PERMISSION_CONTROL, 1, 1, handle_seekcur }, { "seekid", PERMISSION_CONTROL, 2, 2, handle_seekid }, diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx index 16e10b4de..b86cbdae7 100644 --- a/src/command/DatabaseCommands.cxx +++ b/src/command/DatabaseCommands.cxx @@ -55,8 +55,7 @@ handle_lsinfo2(Client &client, int argc, char *argv[]) } static CommandResult -handle_match(Client &client, int argc, char *argv[], - const char *uri, bool fold_case) +handle_match(Client &client, int argc, char *argv[], bool fold_case) { SongFilter filter; if (!filter.Parse(argc - 1, argv + 1, fold_case)) { @@ -64,7 +63,7 @@ handle_match(Client &client, int argc, char *argv[], return CommandResult::ERROR; } - const DatabaseSelection selection(uri, true, &filter); + const DatabaseSelection selection("", true, &filter); Error error; return db_selection_print(client, selection, true, error) @@ -75,25 +74,13 @@ handle_match(Client &client, int argc, char *argv[], CommandResult handle_find(Client &client, int argc, char *argv[]) { - return handle_match(client, argc, argv, "", false); -} - -CommandResult -handle_find_in(Client &client, int argc, char *argv[]) -{ - return handle_match(client, argc - 1, argv + 1, argv[1], false); + return handle_match(client, argc, argv, false); } CommandResult handle_search(Client &client, int argc, char *argv[]) { - return handle_match(client, argc, argv, "", true); -} - -CommandResult -handle_search_in(Client &client, int argc, char *argv[]) -{ - return handle_match(client, argc - 1, argv + 1, argv[1], true); + return handle_match(client, argc, argv, true); } static CommandResult diff --git a/src/command/DatabaseCommands.hxx b/src/command/DatabaseCommands.hxx index fa23c5492..c60caf246 100644 --- a/src/command/DatabaseCommands.hxx +++ b/src/command/DatabaseCommands.hxx @@ -31,18 +31,12 @@ CommandResult handle_find(Client &client, int argc, char *argv[]); CommandResult -handle_find_in(Client &client, int argc, char *argv[]); - -CommandResult handle_findadd(Client &client, int argc, char *argv[]); CommandResult handle_search(Client &client, int argc, char *argv[]); CommandResult -handle_search_in(Client &client, int argc, char *argv[]); - -CommandResult handle_searchadd(Client &client, int argc, char *argv[]); CommandResult |