diff options
Diffstat (limited to 'src/Song.cxx')
-rw-r--r-- | src/Song.cxx | 104 |
1 files changed, 13 insertions, 91 deletions
diff --git a/src/Song.cxx b/src/Song.cxx index 6213d5e66..bb74a6951 100644 --- a/src/Song.cxx +++ b/src/Song.cxx @@ -21,13 +21,12 @@ #include "Song.hxx" #include "Directory.hxx" #include "tag/Tag.hxx" - -#include <glib.h> +#include "util/Alloc.hxx" +#include "DetachedSong.hxx" #include <assert.h> #include <string.h> - -Directory detached_root; +#include <stdlib.h> static Song * song_alloc(const char *uri, Directory *parent) @@ -39,7 +38,7 @@ song_alloc(const char *uri, Directory *parent) assert(uri_length); Song *song = (Song *) - g_malloc(sizeof(*song) - sizeof(song->uri) + uri_length + 1); + xalloc(sizeof(*song) - sizeof(song->uri) + uri_length + 1); song->tag = nullptr; memcpy(song->uri, uri, uri_length + 1); @@ -51,104 +50,27 @@ song_alloc(const char *uri, Directory *parent) } Song * -Song::NewRemote(const char *uri) +Song::NewFrom(DetachedSong &&other, Directory *parent) { - return song_alloc(uri, nullptr); + Song *song = song_alloc(other.GetURI(), parent); + song->tag = new Tag(std::move(other.WritableTag())); + song->mtime = other.GetLastModified(); + song->start_ms = other.GetStartMS(); + song->end_ms = other.GetEndMS(); + return song; } Song * Song::NewFile(const char *path, Directory *parent) { - assert((parent == nullptr) == (*path == '/')); - return song_alloc(path, parent); } -Song * -Song::ReplaceURI(const char *new_uri) -{ - Song *new_song = song_alloc(new_uri, parent); - new_song->tag = tag; - new_song->mtime = mtime; - new_song->start_ms = start_ms; - new_song->end_ms = end_ms; - g_free(this); - return new_song; -} - -Song * -Song::NewDetached(const char *uri) -{ - assert(uri != nullptr); - - return song_alloc(uri, &detached_root); -} - -Song * -Song::DupDetached() const -{ - Song *song; - if (IsInDatabase()) { - const auto new_uri = GetURI(); - song = NewDetached(new_uri.c_str()); - } else - song = song_alloc(uri, nullptr); - - song->tag = tag != nullptr ? new Tag(*tag) : nullptr; - song->mtime = mtime; - song->start_ms = start_ms; - song->end_ms = end_ms; - - return song; -} - void Song::Free() { delete tag; - g_free(this); -} - -void -Song::ReplaceTag(Tag &&_tag) -{ - if (tag == nullptr) - tag = new Tag(); - *tag = std::move(_tag); -} - -gcc_pure -static inline bool -directory_equals(const Directory &a, const Directory &b) -{ - return strcmp(a.path, b.path) == 0; -} - -gcc_pure -static inline bool -directory_is_same(const Directory *a, const Directory *b) -{ - return a == b || - (a != nullptr && b != nullptr && - directory_equals(*a, *b)); - -} - -bool -SongEquals(const Song &a, const Song &b) -{ - if (a.parent != nullptr && b.parent != nullptr && - !directory_equals(*a.parent, *b.parent) && - (a.parent == &detached_root || b.parent == &detached_root)) { - /* must compare the full URI if one of the objects is - "detached" */ - const auto au = a.GetURI(); - const auto bu = b.GetURI(); - return au == bu; - } - - return directory_is_same(a.parent, b.parent) && - strcmp(a.uri, b.uri) == 0; + free(this); } std::string @@ -156,7 +78,7 @@ Song::GetURI() const { assert(*uri); - if (!IsInDatabase() || parent->IsRoot()) + if (parent == nullptr || parent->IsRoot()) return std::string(uri); else { const char *path = parent->GetPath(); |