1 files changed, 39 insertions, 112 deletions

diff --git a/src/Song.cxx b/src/Song.cxx
index 6213d5e66..15924a40a 100644
--- a/src/Song.cxx
+++ b/src/Song.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,16 +21,26 @@
 #include "Song.hxx"
 #include "Directory.hxx"
 #include "tag/Tag.hxx"
-
-#include <glib.h>
+#include "util/VarSize.hxx"
+#include "DetachedSong.hxx"
+#include "LightSong.hxx"
 
 #include <assert.h>
 #include <string.h>
+#include <stdlib.h>
+
+inline Song::Song(const char *_uri, size_t uri_length, Directory &_parent)
+	:parent(&_parent), mtime(0), start_ms(0), end_ms(0)
+{
+	memcpy(uri, _uri, uri_length + 1);
+}
 
-Directory detached_root;
+inline Song::~Song()
+{
+}
 
 static Song *
-song_alloc(const char *uri, Directory *parent)
+song_alloc(const char *uri, Directory &parent)
 {
 	size_t uri_length;
 
@@ -38,117 +48,32 @@ song_alloc(const char *uri, Directory *parent)
 	uri_length = strlen(uri);
 	assert(uri_length);
 
-	Song *song = (Song *)
-		g_malloc(sizeof(*song) - sizeof(song->uri) + uri_length + 1);
-
-	song->tag = nullptr;
-	memcpy(song->uri, uri, uri_length + 1);
-	song->parent = parent;
-	song->mtime = 0;
-	song->start_ms = song->end_ms = 0;
-
-	return song;
+	return NewVarSize<Song>(sizeof(Song::uri),
+				uri_length + 1,
+				uri, uri_length, 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 = 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)
+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;
+	DeleteVarSize(this);
 }
 
 std::string
@@ -156,7 +81,7 @@ Song::GetURI() const
 {
 	assert(*uri);
 
-	if (!IsInDatabase() || parent->IsRoot())
+	if (parent->IsRoot())
 		return std::string(uri);
 	else {
 		const char *path = parent->GetPath();
@@ -170,14 +95,16 @@ Song::GetURI() const
 	}
 }
 
-double
-Song::GetDuration() const
+LightSong
+Song::Export() const
 {
-	if (end_ms > 0)
-		return (end_ms - start_ms) / 1000.0;
-
-	if (tag == nullptr)
-		return 0;
-
-	return tag->time - start_ms / 1000.0;
+	LightSong dest;
+	dest.directory = parent->IsRoot()
+		? nullptr : parent->GetPath();
+	dest.uri = uri;
+	dest.tag = &tag;
+	dest.mtime = mtime;
+	dest.start_ms = start_ms;
+	dest.end_ms = end_ms;
+	return dest;
 }