Commit a485c485 authored by skidoo23's avatar skidoo23

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

parent 3c955639
...@@ -219,11 +219,24 @@ get_song_length(T &tune) noexcept ...@@ -219,11 +219,24 @@ get_song_length(T &tune) noexcept
if (sidplay_global->songlength_database == nullptr) if (sidplay_global->songlength_database == nullptr)
return SignedSongTime::Negative(); return SignedSongTime::Negative();
const auto length = sidplay_global->songlength_database->length(tune); #if LIBSIDPLAYFP_VERSION_MAJ >= 2
if (length < 0) 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::Negative();
return SignedSongTime::FromS(length); #if LIBSIDPLAYFP_VERSION_MAJ >= 2
}
return SignedSongTime::FromMS(lengthms);
#endif
} }
static void static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment