Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not open mp3 files twice while writing tags into them

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-10-02 00:30:14 +02:00
parent 55173cb419
commit dfb651be62
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tag_editor.cpp
View File

@@ -931,10 +931,6 @@ bool TagEditor::WriteTags(MPD::Song &s)
TagLib::FileRef f(path_to_file.c_str()); TagLib::FileRef f(path_to_file.c_str());
if (!f.isNull()) if (!f.isNull())
{ {
std::string ext = s.GetFile();
ext = ext.substr(ext.rfind(".")+1);
ToLower(ext);
f.tag()->setTitle(ToWString(s.GetTitle())); f.tag()->setTitle(ToWString(s.GetTitle()));
f.tag()->setArtist(ToWString(s.GetArtist())); f.tag()->setArtist(ToWString(s.GetArtist()));
f.tag()->setAlbum(ToWString(s.GetAlbum())); f.tag()->setAlbum(ToWString(s.GetAlbum()));
@@ -942,13 +938,9 @@ bool TagEditor::WriteTags(MPD::Song &s)
f.tag()->setTrack(StrToInt(s.GetTrack())); f.tag()->setTrack(StrToInt(s.GetTrack()));
f.tag()->setGenre(ToWString(s.GetGenre())); f.tag()->setGenre(ToWString(s.GetGenre()));
f.tag()->setComment(ToWString(s.GetComment())); f.tag()->setComment(ToWString(s.GetComment()));
if (!f.save()) if (TagLib::MPEG::File *file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
return false;
if (ext == "mp3")
{ {
TagLib::MPEG::File file(path_to_file.c_str()); TagLib::ID3v2::Tag *tag = file->ID3v2Tag();
TagLib::ID3v2::Tag *tag = file.ID3v2Tag();
TagLib::StringList list; TagLib::StringList list;
WriteID3v2("TIT2", tag, ToWString(s.GetTitle())); // title WriteID3v2("TIT2", tag, ToWString(s.GetTitle())); // title
@@ -964,10 +956,9 @@ bool TagEditor::WriteTags(MPD::Song &s)
GetTagList(list, s.GetPerformer()); GetTagList(list, s.GetPerformer());
WriteID3v2("TOPE", tag, list); // performer WriteID3v2("TOPE", tag, list); // performer
if (!file.save())
return false;
} }
if (!f.save())
return false;
if (!s.GetNewName().empty()) if (!s.GetNewName().empty())
{ {