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

Directory: rename struct directory to Directory

Browse Source
This commit is contained in:
Max Kellermann
2013-01-02 23:06:20 +01:00
parent 440ac51cf0
commit 3e8047e583
36 changed files with 180 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/db/ProxyDatabasePlugin.cxx
View File

@@ -45,7 +45,7 @@ class ProxyDatabase : public Database {
unsigned port;
struct mpd_connection *connection;
struct directory *root;
Directory *root;
public:
static Database *Create(const struct config_param *param,
@@ -168,7 +168,7 @@ ProxyDatabase::Open(GError **error_r)
return false;
}
root = directory::NewRoot();
root = Directory::NewRoot();
return true;
}
@@ -240,8 +240,7 @@ Visit(struct mpd_connection *connection,
const char *path = mpd_directory_get_path(directory);
if (visit_directory) {
struct directory *d =
directory::NewGeneric(path, &detached_root);
Directory *d = Directory::NewGeneric(path, &detached_root);
bool success = visit_directory(*d, error_r);
d->Free();
if (!success)

8
src/db/SimpleDatabasePlugin.cxx
View File

@@ -180,7 +180,7 @@ SimpleDatabase::Load(GError **error_r)
bool
SimpleDatabase::Open(GError **error_r)
{
root = directory::NewRoot();
root = Directory::NewRoot();
mtime = 0;
#ifndef NDEBUG
@@ -197,7 +197,7 @@ SimpleDatabase::Open(GError **error_r)
if (!Check(error_r))
return false;
root = directory::NewRoot();
root = Directory::NewRoot();
}
return true;
@@ -243,7 +243,7 @@ SimpleDatabase::ReturnSong(gcc_unused struct song *song) const
}
G_GNUC_PURE
const struct directory *
const Directory *
SimpleDatabase::LookupDirectory(const char *uri) const
{
assert(root != NULL);
@@ -262,7 +262,7 @@ SimpleDatabase::Visit(const DatabaseSelection &selection,
{
ScopeDatabaseLock protect;
const directory *directory = root->LookupDirectory(selection.uri);
const Directory *directory = root->LookupDirectory(selection.uri);
if (directory == NULL) {
if (visit_song) {
song *song = root->LookupSong(selection.uri);

8
src/db/SimpleDatabasePlugin.hxx
View File

@@ -28,12 +28,12 @@
#include <time.h>
struct directory;
struct Directory;
class SimpleDatabase : public Database {
std::string path;
struct directory *root;
Directory *root;
time_t mtime;
@@ -43,7 +43,7 @@ class SimpleDatabase : public Database {
public:
gcc_pure
struct directory *GetRoot() {
Directory *GetRoot() {
assert(root != NULL);
return root;
@@ -90,7 +90,7 @@ protected:
bool Load(GError **error_r);
gcc_pure
const struct directory *LookupDirectory(const char *uri) const;
const Directory *LookupDirectory(const char *uri) const;
};
extern const DatabasePlugin simple_db_plugin;