From f5ae1ce00b85699291a7cdf9782574e70a8c28f5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 19 Jan 2014 10:51:34 +0100 Subject: LightSong: new class to be used by DatabasePlugin callbacks Detach the Song class completely from the public API, only to be used by SimpleDatabase and the update thread. --- src/Song.cxx | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src/Song.cxx') diff --git a/src/Song.cxx b/src/Song.cxx index 384307642..565b9af98 100644 --- a/src/Song.cxx +++ b/src/Song.cxx @@ -23,6 +23,7 @@ #include "tag/Tag.hxx" #include "util/VarSize.hxx" #include "DetachedSong.hxx" +#include "LightSong.hxx" #include #include @@ -94,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.time <= 0) - 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; } -- cgit v1.2.3