diff options
| author | Max Kellermann <max@duempel.org> | 2013-07-28 13:25:12 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-07-28 13:25:12 +0200 |
| commit | ba161ec572b98d3bcf9f735ff122133319fe896a (patch) | |
| tree | a211690e3a8b7fce1fb6db540228122bead1f2bc /src/Mapper.cxx | |
| parent | 43f613d9be9aa2953dcfc0aacfbdfb56d5d1a708 (diff) | |
| download | mpd-ba161ec572b98d3bcf9f735ff122133319fe896a.tar.gz mpd-ba161ec572b98d3bcf9f735ff122133319fe896a.tar.xz mpd-ba161ec572b98d3bcf9f735ff122133319fe896a.zip | |
song: convert header to C++
Diffstat (limited to '')
| -rw-r--r-- | src/Mapper.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Mapper.cxx b/src/Mapper.cxx index 40e762e4b..6f4a9cdcc 100644 --- a/src/Mapper.cxx +++ b/src/Mapper.cxx @@ -24,7 +24,7 @@ #include "config.h" #include "Mapper.hxx" #include "Directory.hxx" -#include "song.h" +#include "Song.hxx" #include "fs/Path.hxx" #include "fs/FileSystem.hxx" #include "fs/DirectoryReader.hxx" @@ -246,12 +246,12 @@ map_detached_song_fs(const char *uri_utf8) } Path -map_song_fs(const struct song *song) +map_song_fs(const Song *song) { - assert(song_is_file(song)); + assert(song->IsFile()); - if (song_in_database(song)) - return song_is_detached(song) + if (song->IsInDatabase()) + return song->IsDetached() ? map_detached_song_fs(song->uri) : map_directory_child_fs(song->parent, song->uri); else |