diff options
| author | Max Kellermann <max@duempel.org> | 2014-04-24 18:09:39 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-04-24 18:09:39 +0200 |
| commit | 0de42d56fc000eca07ee6c9cc750d391be994397 (patch) | |
| tree | 205701756a2cd988e097d717236cd04eca374794 | |
| parent | 6378ad69bb053b89495c1ad957fe4774d0c19bb9 (diff) | |
| download | mpd-0de42d56fc000eca07ee6c9cc750d391be994397.tar.gz mpd-0de42d56fc000eca07ee6c9cc750d391be994397.tar.xz mpd-0de42d56fc000eca07ee6c9cc750d391be994397.zip | |
DatabasePrint: eliminate printAllIn(), printInfoForAllIn()
| -rw-r--r-- | src/command/DatabaseCommands.cxx | 6 | ||||
| -rw-r--r-- | src/db/DatabasePrint.cxx | 15 | ||||
| -rw-r--r-- | src/db/DatabasePrint.hxx | 9 |
3 files changed, 4 insertions, 26 deletions
diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx index 23ff593a4..d586067c1 100644 --- a/src/command/DatabaseCommands.cxx +++ b/src/command/DatabaseCommands.cxx @@ -173,7 +173,8 @@ handle_listall(Client &client, gcc_unused int argc, char *argv[]) directory = argv[1]; Error error; - return printAllIn(client, directory, error) + return db_selection_print(client, DatabaseSelection(directory, true), + false, false, error) ? CommandResult::OK : print_error(client, error); } @@ -253,7 +254,8 @@ handle_listallinfo(Client &client, gcc_unused int argc, char *argv[]) directory = argv[1]; Error error; - return printInfoForAllIn(client, directory, error) + return db_selection_print(client, DatabaseSelection(directory, true), + true, false, error) ? CommandResult::OK : print_error(client, error); } diff --git a/src/db/DatabasePrint.cxx b/src/db/DatabasePrint.cxx index 0e91db5d5..4693b8e08 100644 --- a/src/db/DatabasePrint.cxx +++ b/src/db/DatabasePrint.cxx @@ -216,21 +216,6 @@ searchStatsForSongsIn(Client &client, const char *name, return true; } -bool -printAllIn(Client &client, const char *uri_utf8, Error &error) -{ - const DatabaseSelection selection(uri_utf8, true); - return db_selection_print(client, selection, false, false, error); -} - -bool -printInfoForAllIn(Client &client, const char *uri_utf8, - Error &error) -{ - const DatabaseSelection selection(uri_utf8, true); - return db_selection_print(client, selection, true, false, error); -} - static bool PrintSongURIVisitor(Client &client, const LightSong &song) { diff --git a/src/db/DatabasePrint.hxx b/src/db/DatabasePrint.hxx index c4c719ca0..fd151684e 100644 --- a/src/db/DatabasePrint.hxx +++ b/src/db/DatabasePrint.hxx @@ -39,15 +39,6 @@ db_selection_print(Client &client, const DatabaseSelection &selection, gcc_nonnull(2) bool -printAllIn(Client &client, const char *uri_utf8, Error &error); - -gcc_nonnull(2) -bool -printInfoForAllIn(Client &client, const char *uri_utf8, - Error &error); - -gcc_nonnull(2) -bool searchStatsForSongsIn(Client &client, const char *name, const SongFilter *filter, Error &error); |