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

decoder/gme: simplify LoadGmeAndM3u() by moving code to ReplaceSuffix()

This commit is contained in:
Max Kellermann 2020-06-10 21:18:45 +02:00
parent 8925cc17d8
commit fea326530b
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/decoder/plugins/GmeDecoderPlugin.cxx
View File

@ -102,35 +102,39 @@ ParseContainerPath(Path path_fs)
return { path_fs.GetDirectoryName(), track - 1 }; return { path_fs.GetDirectoryName(), track - 1 };
} }
static AllocatedPath
ReplaceSuffix(Path src,
const PathTraitsFS::const_pointer_type new_suffix) noexcept
{
const auto *old_suffix = src.GetSuffix();
if (old_suffix == nullptr)
return nullptr;
PathTraitsFS::string s(src.c_str(), old_suffix);
s += new_suffix;
return AllocatedPath::FromFS(std::move(s));
}
static Music_Emu* static Music_Emu*
LoadGmeAndM3u(GmeContainerPath container) { LoadGmeAndM3u(GmeContainerPath container) {
const char *path = container.path.c_str();
const auto *suffix = container.path.GetSuffix();
Music_Emu *emu; Music_Emu *emu;
const char *gme_err = const char *gme_err =
gme_open_file(path, &emu, GME_SAMPLE_RATE); gme_open_file(container.path.c_str(), &emu, GME_SAMPLE_RATE);
if (gme_err != nullptr) { if (gme_err != nullptr) {
LogWarning(gme_domain, gme_err); LogWarning(gme_domain, gme_err);
return nullptr; return nullptr;
} }
if(suffix == nullptr) { const auto m3u_path = ReplaceSuffix(container.path, "m3u");
return emu;
}
std::string m3u_path(path,suffix);
m3u_path += "m3u";
/* /*
* Some GME formats lose metadata if you attempt to * Some GME formats lose metadata if you attempt to
* load a non-existant M3U file, so check that one * load a non-existant M3U file, so check that one
* exists before loading. * exists before loading.
*/ */
if(FileExists(Path::FromFS(m3u_path.c_str()))) { if (!m3u_path.IsNull() && FileExists(m3u_path))
gme_load_m3u(emu, m3u_path.c_str()); gme_load_m3u(emu, m3u_path.c_str());
}
return emu; return emu;
} }