From 06f898cc1240a29b293de0e97ad95a4fdc971254 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 30 Jul 2013 20:11:57 +0200
Subject: tag: convert to C++

---
 src/PlaylistSong.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/PlaylistSong.cxx')

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;
-- 
cgit v1.2.3