From 06f898cc1240a29b293de0e97ad95a4fdc971254 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 30 Jul 2013 20:11:57 +0200 Subject: tag: convert to C++ --- src/Song.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Song.cxx') diff --git a/src/Song.cxx b/src/Song.cxx index 90ddcf518..023d52071 100644 --- a/src/Song.cxx +++ b/src/Song.cxx @@ -20,11 +20,12 @@ #include "config.h" #include "Song.hxx" #include "Directory.hxx" -#include "tag.h" +#include "Tag.hxx" #include #include +#include Directory detached_root; @@ -94,7 +95,7 @@ Song::DupDetached() const } else song = song_alloc(uri, nullptr); - song->tag = tag_dup(tag); + song->tag = tag != nullptr ? new Tag(*tag) : nullptr; song->mtime = mtime; song->start_ms = start_ms; song->end_ms = end_ms; @@ -105,8 +106,7 @@ Song::DupDetached() const void Song::Free() { - if (tag != nullptr) - tag_free(tag); + delete tag; g_free(this); } -- cgit v1.2.3