diff options
Diffstat (limited to '')
-rw-r--r-- | src/LightSong.cxx (renamed from test/FakeSong.cxx) | 20 | ||||
-rw-r--r-- | test/DumpDatabase.cxx | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/test/FakeSong.cxx b/src/LightSong.cxx index e2fae4d6e..af1e801f8 100644 --- a/test/FakeSong.cxx +++ b/src/LightSong.cxx @@ -17,17 +17,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" -#include "Song.hxx" -#include "directory.h" -#include "Compiler.h" +#include "LightSong.hxx" +#include "tag/Tag.hxx" -#include <stdlib.h> +double +LightSong::GetDuration() const +{ + if (end_ms > 0) + return (end_ms - start_ms) / 1000.0; -struct directory detached_root; + if (tag->time <= 0) + return 0; -Song * -song_dup_detached(gcc_unused const Song *src) -{ - abort(); + return tag->time - start_ms / 1000.0; } diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx index ade6b5345..60c20e4ae 100644 --- a/test/DumpDatabase.cxx +++ b/test/DumpDatabase.cxx @@ -23,7 +23,7 @@ #include "DatabaseSelection.hxx" #include "DatabaseListener.hxx" #include "Directory.hxx" -#include "Song.hxx" +#include "LightSong.hxx" #include "PlaylistVector.hxx" #include "ConfigGlobal.hxx" #include "ConfigData.hxx" @@ -65,11 +65,11 @@ DumpDirectory(const Directory &directory, Error &) } static bool -DumpSong(Song &song, Error &) +DumpSong(const LightSong &song, Error &) { cout << "S "; - if (song.parent != nullptr && !song.parent->IsRoot()) - cout << song.parent->path << "/"; + if (song.directory != nullptr) + cout << song.directory << "/"; cout << song.uri << endl; return true; } |