dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only set disc and year in CUE parser when valid

Browse Source
This commit is contained in:
Jonas Kvinge
2020-12-07 21:57:15 +01:00
parent 0a31a94ee8
commit 380aa7d884
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/playlistparsers/cueparser.cpp
View File

@@ -295,8 +295,11 @@ bool CueParser::UpdateSong(const CueEntry &entry, const QString &next_index, Son
song->set_albumartist(entry.album_artist); song->set_albumartist(entry.album_artist);
song->set_composer(entry.PrettyComposer()); song->set_composer(entry.PrettyComposer());
song->set_genre(entry.genre); song->set_genre(entry.genre);
song->set_year(entry.date.toInt());
song->set_disc(entry.disc.toInt()); int year = entry.date.toInt();
if (year > 0) song->set_year(year);
int disc = entry.disc.toInt();
if (disc > 0) song->set_disc(disc);
return true; return true;
@@ -320,9 +323,12 @@ bool CueParser::UpdateLastSong(const CueEntry &entry, Song *song) const {
song->set_album(entry.album); song->set_album(entry.album);
song->set_albumartist(entry.album_artist); song->set_albumartist(entry.album_artist);
song->set_genre(entry.genre); song->set_genre(entry.genre);
song->set_year(entry.date.toInt());
song->set_composer(entry.PrettyComposer()); song->set_composer(entry.PrettyComposer());
song->set_disc(entry.disc.toInt());
int year = entry.date.toInt();
if (year > 0) song->set_year(year);
int disc = entry.disc.toInt();
if (disc > 0) song->set_disc(disc);
// We don't do anything with the end here because it's already set to the end of the media file (if it exists) // We don't do anything with the end here because it's already set to the end of the media file (if it exists)
song->set_beginning_nanosec(beginning); song->set_beginning_nanosec(beginning);