oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/simple/Song: remove static method NewFile()

Browse Source
This commit is contained in:
Max Kellermann 2019-09-04 11:24:44 +02:00
parent 6a13847287
commit 497d090814
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SongUpdate.cxx
View File

@ -45,7 +45,7 @@ Song::LoadFile(Storage &storage, const char *path_utf8, Directory &parent)
assert(!uri_has_scheme(path_utf8)); assert(!uri_has_scheme(path_utf8));
assert(strchr(path_utf8, '\n') == nullptr); 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)) if (!song->UpdateFile(storage))
return nullptr; return nullptr;
@ -98,8 +98,7 @@ Song::LoadFromArchive(ArchiveFile &archive, const char *name_utf8,
assert(!uri_has_scheme(name_utf8)); assert(!uri_has_scheme(name_utf8));
assert(strchr(name_utf8, '\n') == nullptr); 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)) if (!song->UpdateFileInArchive(archive))
return nullptr; return nullptr;

6
src/db/plugins/simple/Song.cxx
View File

@ -48,12 +48,6 @@ Song::NewFrom(DetachedSong &&other, Directory &parent) noexcept
return song; return song;
} }
SongPtr
Song::NewFile(const char *path, Directory &parent) noexcept
{
return SongPtr(song_alloc(path, parent));
}
std::string std::string
Song::GetURI() const noexcept Song::GetURI() const noexcept
{ {

3
src/db/plugins/simple/Song.hxx
View File

@ -101,9 +101,6 @@ struct Song {
static SongPtr NewFrom(DetachedSong &&other, Directory &parent) noexcept; 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 * 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 * load its metadata. If all decoder plugin fail to read its meta