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

Directory: turn functions to methods

Browse Source
This commit is contained in:
Max Kellermann
2013-01-02 23:06:10 +01:00
parent 0c245bc271
commit 0eb05b827f
16 changed files with 274 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/UpdateArchive.cxx
View File

@@ -43,7 +43,7 @@ update_archive_tree(struct directory *directory, char *name)
//add dir is not there already
db_lock();
struct directory *subdir =
directory_make_child(directory, name);
directory->MakeChild(name);
subdir->device = DEVICE_INARCHIVE;
db_unlock();
//create directories first
@@ -56,18 +56,18 @@ update_archive_tree(struct directory *directory, char *name)
//add file
db_lock();
struct song *song = directory_get_song(directory, name);
struct song *song = directory->FindSong(name);
db_unlock();
if (song == NULL) {
song = song_file_load(name, directory);
if (song != NULL) {
db_lock();
directory_add_song(directory, song);
directory->AddSong(song);
db_unlock();
modified = true;
g_message("added %s/%s",
directory_get_path(directory), name);
directory->GetPath(), name);
}
}
}
@@ -87,7 +87,7 @@ update_archive_file2(struct directory *parent, const char *name,
const struct archive_plugin *plugin)
{
db_lock();
struct directory *directory = directory_get_child(parent, name);
directory *directory = parent->FindChild(name);
db_unlock();
if (directory != NULL && directory->mtime == st->st_mtime &&
@@ -114,7 +114,7 @@ update_archive_file2(struct directory *parent, const char *name,
if (directory == NULL) {
g_debug("creating archive directory: %s", name);
db_lock();
directory = directory_new_child(parent, name);
directory = parent->CreateChild(name);
/* mark this directory as archive (we use device for
this) */
directory->device = DEVICE_INARCHIVE;