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

Song: make the "parent" attribute mandatory

Browse Source 
The Song class is only used for database songs now.  A Song without a
Directory is not possible anymore.
This commit is contained in:
Max Kellermann
2014-01-19 19:57:27 +01:00
parent a506adea41
commit 64465c1318
6 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/SongUpdate.cxx
View File

@@ -40,19 +40,18 @@
#include <sys/stat.h>
Song *
Song::LoadFile(const char *path_utf8, Directory *parent)
Song::LoadFile(const char *path_utf8, Directory &parent)
{
Song *song;
bool ret;
assert((parent == nullptr) == PathTraitsUTF8::IsAbsolute(path_utf8));
assert(!uri_has_scheme(path_utf8));
assert(strchr(path_utf8, '\n') == nullptr);
song = NewFile(path_utf8, parent);
//in archive ?
if (parent != nullptr && parent->device == DEVICE_INARCHIVE) {
if (parent.device == DEVICE_INARCHIVE) {
ret = song->UpdateFileInArchive();
} else {
ret = song->UpdateFile();