diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx index 72714fa0f73e6d09454386a78a04cfc40ce10110..733f0ef35a03f3bc6fc128ea2b35de03f86b0b83 100644 --- a/src/SongUpdate.cxx +++ b/src/SongUpdate.cxx @@ -45,7 +45,7 @@ Song::LoadFile(Storage &storage, const char *path_utf8, Directory &parent) assert(!uri_has_scheme(path_utf8)); assert(strchr(path_utf8, '\n') == nullptr); - auto song = NewFile(path_utf8, parent); + auto song = std::make_unique<Song>(path_utf8, parent); if (!song->UpdateFile(storage)) return nullptr; @@ -98,8 +98,7 @@ Song::LoadFromArchive(ArchiveFile &archive, const char *name_utf8, assert(!uri_has_scheme(name_utf8)); assert(strchr(name_utf8, '\n') == nullptr); - auto song = NewFile(name_utf8, parent); - + auto song = std::make_unique<Song>(name_utf8, parent); if (!song->UpdateFileInArchive(archive)) return nullptr; diff --git a/src/db/plugins/simple/Song.cxx b/src/db/plugins/simple/Song.cxx index f5b0b539e7e2f15dab2aed79f177a1eac487b8d3..e46398fa1695534884ed2b0727ae4688a00a9abf 100644 --- a/src/db/plugins/simple/Song.cxx +++ b/src/db/plugins/simple/Song.cxx @@ -48,12 +48,6 @@ Song::NewFrom(DetachedSong &&other, Directory &parent) noexcept return song; } -SongPtr -Song::NewFile(const char *path, Directory &parent) noexcept -{ - return SongPtr(song_alloc(path, parent)); -} - std::string Song::GetURI() const noexcept { diff --git a/src/db/plugins/simple/Song.hxx b/src/db/plugins/simple/Song.hxx index 8df7d949620663bc46a0ae3b04d1dc6bcd984e15..deeae85ef504b6e4b65e86b00fdb281629d5f1a8 100644 --- a/src/db/plugins/simple/Song.hxx +++ b/src/db/plugins/simple/Song.hxx @@ -101,9 +101,6 @@ struct Song { static SongPtr NewFrom(DetachedSong &&other, Directory &parent) noexcept; - /** allocate a new song with a local file name */ - static SongPtr NewFile(const char *path_utf8, Directory &parent) noexcept; - /** * allocate a new song structure with a local file name and attempt to * load its metadata. If all decoder plugin fail to read its meta