diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/DumpDatabase.cxx | 8 | ||||
| -rw-r--r-- | test/FakeSong.cxx | 33 |
2 files changed, 4 insertions, 37 deletions
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; } diff --git a/test/FakeSong.cxx b/test/FakeSong.cxx deleted file mode 100644 index e2fae4d6e..000000000 --- a/test/FakeSong.cxx +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" -#include "Song.hxx" -#include "directory.h" -#include "Compiler.h" - -#include <stdlib.h> - -struct directory detached_root; - -Song * -song_dup_detached(gcc_unused const Song *src) -{ - abort(); -} |