diff options
| author | Max Kellermann <max@duempel.org> | 2013-07-30 20:11:57 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-07-30 20:19:53 +0200 |
| commit | 06f898cc1240a29b293de0e97ad95a4fdc971254 (patch) | |
| tree | 001a6d3db039cdc03323f3bfddc13b94bde31ce4 /src/PlaylistSong.cxx | |
| parent | 6a9ab8bc0e2f5d34803513bb2d94d041a607a58c (diff) | |
| download | mpd-06f898cc1240a29b293de0e97ad95a4fdc971254.tar.gz mpd-06f898cc1240a29b293de0e97ad95a4fdc971254.tar.xz mpd-06f898cc1240a29b293de0e97ad95a4fdc971254.zip | |
tag: convert to C++
Diffstat (limited to 'src/PlaylistSong.cxx')
| -rw-r--r-- | src/PlaylistSong.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/PlaylistSong.cxx b/src/PlaylistSong.cxx index 510124215..5de1f5c8c 100644 --- a/src/PlaylistSong.cxx +++ b/src/PlaylistSong.cxx @@ -23,7 +23,7 @@ #include "DatabasePlugin.hxx" #include "DatabaseGlue.hxx" #include "ls.hxx" -#include "tag.h" +#include "Tag.hxx" #include "fs/Path.hxx" #include "util/UriUtil.hxx" #include "Song.hxx" @@ -39,10 +39,10 @@ merge_song_metadata(Song *dest, const Song *base, { dest->tag = base->tag != NULL ? (add->tag != NULL - ? tag_merge(base->tag, add->tag) - : tag_dup(base->tag)) + ? Tag::Merge(*base->tag, *add->tag) + : new Tag(*base->tag)) : (add->tag != NULL - ? tag_dup(add->tag) + ? new Tag(*add->tag) : NULL); dest->mtime = base->mtime; |