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

decoder/sidplay: support new song length format with libsidplayfp 2.0

This commit is contained in:
skidoo23 2020-04-29 16:27:54 +02:00
parent 3c955639a7
commit a485c4856c
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/decoder/plugins/SidplayDecoderPlugin.cxx
View File

@ -219,11 +219,24 @@ get_song_length(T &tune) noexcept
if (sidplay_global->songlength_database == nullptr)
return SignedSongTime::Negative();
const auto length = sidplay_global->songlength_database->length(tune);
if (length < 0)
#if LIBSIDPLAYFP_VERSION_MAJ >= 2
const auto lengthms =
sidplay_global->songlength_database->lengthMs(tune);
/* check for new song length format since HVSC#68 or later */
if (lengthms < 0)
{
#endif
/* old song lenghth format */
const auto length =
sidplay_global->songlength_database->length(tune);
if (length >= 0)
return SignedSongTime::FromS(length);
return SignedSongTime::Negative();
return SignedSongTime::FromS(length);
#if LIBSIDPLAYFP_VERSION_MAJ >= 2
}
return SignedSongTime::FromMS(lengthms);
#endif
}
static void