From 64465c1318e227ca625ee2047ec8b6a8f0c2faff Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 19 Jan 2014 19:57:27 +0100
Subject: Song: make the "parent" attribute mandatory
The Song class is only used for database songs now. A Song without a
Directory is not possible anymore.
---
src/SongUpdate.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'src/SongUpdate.cxx')
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index dd01ea7d7..ee70085f3 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -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();
--
cgit v1.2.3