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

decoder/sidplay: use template to eliminate duplicate code

Browse Source
This commit is contained in:
Max Kellermann 2016-11-22 13:17:31 +01:00
parent ffb9874d84
commit bf78b7f815
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,10 +142,13 @@ ParseContainerPath(Path path_fs)
return { path_fs.GetDirectoryName(), track }; return { path_fs.GetDirectoryName(), track };
} }
#ifdef HAVE_SIDPLAYFP /**
* This is a template, because libsidplay requires SidTuneMod while
* libsidplayfp requires just a plain Sidtune.
*/
template<typename T>
static SignedSongTime static SignedSongTime
get_song_length(SidTune &tune) get_song_length(T &tune)
{ {
assert(tune.getStatus()); assert(tune.getStatus());
@ -159,25 +162,6 @@ get_song_length(SidTune &tune)
return SignedSongTime::FromS(length); return SignedSongTime::FromS(length);
} }
#else
static SignedSongTime
get_song_length(SidTuneMod &tune)
{
assert(tune);
if (songlength_database == nullptr)
return SignedSongTime::Negative();
const auto length = songlength_database->length(tune);
if (length < 0)
return SignedSongTime::Negative();
return SignedSongTime::FromS(length);
}
#endif
static void static void
sidplay_file_decode(DecoderClient &client, Path path_fs) sidplay_file_decode(DecoderClient &client, Path path_fs)
{ {