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

db_print.h: rename to DatabasePrint.hxx

This commit is contained in:
Max Kellermann 2012-08-07 23:10:34 +02:00
parent 4d6c816abb
commit b3d76b7e5c
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -253,13 +253,12 @@ src_mpd_SOURCES = \
src/Directory.cxx \ src/Directory.cxx \
src/directory_save.c \ src/directory_save.c \
src/DatabaseGlue.cxx \ src/DatabaseGlue.cxx \
src/DatabasePrint.cxx \ src/DatabasePrint.cxx src/DatabasePrint.hxx \
src/DatabaseQueue.cxx src/DatabaseQueue.hxx \ src/DatabaseQueue.cxx src/DatabaseQueue.hxx \
src/DatabasePlaylist.cxx src/DatabasePlaylist.hxx \ src/DatabasePlaylist.cxx src/DatabasePlaylist.hxx \
src/db_error.h \ src/db_error.h \
src/db_lock.c src/db_lock.h \ src/db_lock.c src/db_lock.h \
src/db_save.c src/db_save.h \ src/db_save.c src/db_save.h \
src/db_print.h \
src/db_visitor.h \ src/db_visitor.h \
src/DatabasePlugin.hxx \ src/DatabasePlugin.hxx \
src/DatabaseVisitor.hxx \ src/DatabaseVisitor.hxx \

4
src/DatabaseCommands.cxx
View File

@ -21,13 +21,13 @@
#include "DatabaseCommands.hxx" #include "DatabaseCommands.hxx"
#include "DatabaseQueue.hxx" #include "DatabaseQueue.hxx"
#include "DatabasePlaylist.hxx" #include "DatabasePlaylist.hxx"
#include "DatabasePrint.hxx"
#include "CommandError.h" #include "CommandError.h"
#include "client_internal.h" #include "client_internal.h"
#include "tag.h" #include "tag.h"
#include "uri.h" #include "uri.h"
extern "C" { extern "C" {
#include "db_print.h"
#include "db_selection.h" #include "db_selection.h"
#include "locate.h" #include "locate.h"
#include "protocol/result.h" #include "protocol/result.h"
@ -51,7 +51,7 @@ handle_lsinfo2(struct client *client, int argc, char *argv[])
db_selection_init(&selection, uri, false); db_selection_init(&selection, uri, false);
GError *error = NULL; GError *error = NULL;
if (!db_selection_print(client, &selection, true, &error)) if (!db_selection_print(client, selection, true, &error))
return print_error(client, error); return print_error(client, error);
return COMMAND_RETURN_OK; return COMMAND_RETURN_OK;

10
src/DatabasePrint.cxx
View File

@ -18,9 +18,9 @@
*/ */
#include "config.h" #include "config.h"
#include "DatabasePrint.hxx"
extern "C" { extern "C" {
#include "db_print.h"
#include "db_selection.h" #include "db_selection.h"
#include "locate.h" #include "locate.h"
#include "database.h" #include "database.h"
@ -125,7 +125,7 @@ PrintPlaylistFull(struct client *client,
} }
bool bool
db_selection_print(struct client *client, const struct db_selection *selection, db_selection_print(struct client *client, const db_selection &selection,
bool full, GError **error_r) bool full, GError **error_r)
{ {
using namespace std::placeholders; using namespace std::placeholders;
@ -135,7 +135,7 @@ db_selection_print(struct client *client, const struct db_selection *selection,
const auto p = std::bind(full ? PrintPlaylistFull : PrintPlaylistBrief, const auto p = std::bind(full ? PrintPlaylistFull : PrintPlaylistBrief,
client, _1, _2); client, _1, _2);
return GetDatabase()->Visit(*selection, d, s, p, error_r); return GetDatabase()->Visit(selection, d, s, p, error_r);
} }
static bool static bool
@ -241,7 +241,7 @@ printAllIn(struct client *client, const char *uri_utf8, GError **error_r)
{ {
struct db_selection selection; struct db_selection selection;
db_selection_init(&selection, uri_utf8, true); db_selection_init(&selection, uri_utf8, true);
return db_selection_print(client, &selection, false, error_r); return db_selection_print(client, selection, false, error_r);
} }
bool bool
@ -250,7 +250,7 @@ printInfoForAllIn(struct client *client, const char *uri_utf8,
{ {
struct db_selection selection; struct db_selection selection;
db_selection_init(&selection, uri_utf8, true); db_selection_init(&selection, uri_utf8, true);
return db_selection_print(client, &selection, true, error_r); return db_selection_print(client, selection, true, error_r);
} }
struct StringLess { struct StringLess {

4
src/db_print.h → src/DatabasePrint.hxx
View File

@ -30,9 +30,9 @@ struct locate_item_list;
struct db_selection; struct db_selection;
struct db_visitor; struct db_visitor;
gcc_nonnull(1,2) gcc_nonnull(1)
bool bool
db_selection_print(struct client *client, const struct db_selection *selection, db_selection_print(struct client *client, const db_selection &selection,
bool full, GError **error_r); bool full, GError **error_r);
gcc_nonnull(1,2) gcc_nonnull(1,2)