Commit 96b48a24 authored by Max Kellermann's avatar Max Kellermann

decoder/sidplay: pass parsed path to get_song_length()

Eliminates duplicate ParseContainerPath() call.
parent 9612975c
...@@ -151,12 +151,11 @@ ParseContainerPath(Path path_fs) ...@@ -151,12 +151,11 @@ ParseContainerPath(Path path_fs)
/* get the song length in seconds */ /* get the song length in seconds */
static SignedSongTime static SignedSongTime
get_song_length(Path path_fs) get_song_length(const SidplayContainerPath &container)
{ {
if (songlength_database == nullptr) if (songlength_database == nullptr)
return SignedSongTime::Negative(); return SignedSongTime::Negative();
const auto container = ParseContainerPath(path_fs);
SidTuneMod tune(container.path.c_str()); SidTuneMod tune(container.path.c_str());
if(!tune) { if(!tune) {
LogWarning(sidplay_domain, LogWarning(sidplay_domain,
...@@ -209,7 +208,7 @@ sidplay_file_decode(Decoder &decoder, Path path_fs) ...@@ -209,7 +208,7 @@ sidplay_file_decode(Decoder &decoder, Path path_fs)
const int song_num = container.track; const int song_num = container.track;
tune.selectSong(song_num); tune.selectSong(song_num);
auto duration = get_song_length(path_fs); auto duration = get_song_length(container);
if (duration.IsNegative() && default_songlength > 0) if (duration.IsNegative() && default_songlength > 0)
duration = SongTime::FromS(default_songlength); duration = SongTime::FromS(default_songlength);
...@@ -373,7 +372,7 @@ sidplay_scan_file(Path path_fs, ...@@ -373,7 +372,7 @@ sidplay_scan_file(Path path_fs,
tag_handler_invoke_tag(handler, handler_ctx, TAG_TRACK, track); tag_handler_invoke_tag(handler, handler_ctx, TAG_TRACK, track);
/* time */ /* time */
const auto duration = get_song_length(path_fs); const auto duration = get_song_length(container);
if (!duration.IsNegative()) if (!duration.IsNegative())
tag_handler_invoke_duration(handler, handler_ctx, tag_handler_invoke_duration(handler, handler_ctx,
SongTime(duration)); SongTime(duration));
......
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