oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

DatabasePrint: eliminate printAllIn(), printInfoForAllIn()

Browse Source
This commit is contained in:
Max Kellermann 2014-04-24 18:09:39 +02:00
parent 6378ad69bb
commit 0de42d56fc
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/command/DatabaseCommands.cxx
View File

@ -173,7 +173,8 @@ handle_listall(Client &client, gcc_unused int argc, char *argv[])
directory = argv[1]; directory = argv[1];
Error error; Error error;
return printAllIn(client, directory, error) return db_selection_print(client, DatabaseSelection(directory, true),
false, false, error)
? CommandResult::OK ? CommandResult::OK
: print_error(client, error); : print_error(client, error);
} }
@ -253,7 +254,8 @@ handle_listallinfo(Client &client, gcc_unused int argc, char *argv[])
directory = argv[1]; directory = argv[1];
Error error; Error error;
return printInfoForAllIn(client, directory, error) return db_selection_print(client, DatabaseSelection(directory, true),
true, false, error)
? CommandResult::OK ? CommandResult::OK
: print_error(client, error); : print_error(client, error);
} }

15
src/db/DatabasePrint.cxx
View File

@ -216,21 +216,6 @@ searchStatsForSongsIn(Client &client, const char *name,
return true; 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 static bool
PrintSongURIVisitor(Client &client, const LightSong &song) PrintSongURIVisitor(Client &client, const LightSong &song)
{ {

9
src/db/DatabasePrint.hxx
View File

@ -37,15 +37,6 @@ bool
db_selection_print(Client &client, const DatabaseSelection &selection, db_selection_print(Client &client, const DatabaseSelection &selection,
bool full, bool base, Error &error); bool full, bool base, Error &error);
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) gcc_nonnull(2)
bool bool
searchStatsForSongsIn(Client &client, const char *name, searchStatsForSongsIn(Client &client, const char *name,