Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge: fix std::string to path conversion for various Blu-ray files

Browse Source
This commit is contained in:
Moritz Bunkus 2021-03-05 22:32:51 +01:00
parent 8327e32a64
commit 3aa51835f1
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/bluray/disc_library.cpp
View File

@ -57,7 +57,7 @@ parse_bdmt_xml(std::filesystem::path const &file_name) {
auto ok = false;
if (thumbnail.m_file_name.is_relative())
thumbnail.m_file_name = (mtx::fs::absolute(file_name).parent_path() / thumbnail.m_file_name).lexically_normal();
thumbnail.m_file_name = (mtx::fs::absolute(file_name).parent_path() / mtx::fs::to_path(thumbnail.m_file_name)).lexically_normal();
mtx::regex::jp::VecNum matches;

4
src/common/mm_mpls_multi_file_io.cpp
View File

@ -58,9 +58,9 @@ mm_mpls_multi_file_io_c::open_multi(mm_io_c &in) {
std::vector<std::filesystem::path> file_names;
for (auto const &item : mpls_parser->get_playlist().items) {
auto file = mtx::bluray::find_other_file(mtx::fs::to_path(in.get_file_name()), mtx::fs::to_path("STREAM") / fmt::format("{0}.{1}", item.clip_id, balg::to_lower_copy(item.codec_id)));
auto file = mtx::bluray::find_other_file(mtx::fs::to_path(in.get_file_name()), mtx::fs::to_path("STREAM") / mtx::fs::to_path(fmt::format("{0}.{1}", item.clip_id, balg::to_lower_copy(item.codec_id))));
if (file.empty())
file = mtx::bluray::find_other_file(mtx::fs::to_path(in.get_file_name()), mtx::fs::to_path("STREAM") / fmt::format("{0}.{1}", item.clip_id, "m2ts"));
file = mtx::bluray::find_other_file(mtx::fs::to_path(in.get_file_name()), mtx::fs::to_path("STREAM") / mtx::fs::to_path(fmt::format("{0}.{1}", item.clip_id, "m2ts")));
if (!file.empty())
file_names.push_back(file);

4
src/input/r_mpeg_ts.cpp
View File

@ -2502,7 +2502,7 @@ reader_c::parse_clip_info_file(std::size_t file_idx) {
mxdebug_if(m_debug_clpi, fmt::format("find_clip_info_file: Searching for CLPI corresponding to {0}\n", source_file.u8string()));
auto clpi_file = mtx::bluray::find_other_file(source_file, mtx::fs::to_path("CLIPINF") / fmt::format("{0}.clpi", source_file.stem().u8string()));
auto clpi_file = mtx::bluray::find_other_file(source_file, mtx::fs::to_path("CLIPINF") / mtx::fs::to_path(fmt::format("{0}.clpi", source_file.stem().u8string())));
mxdebug_if(m_debug_clpi, fmt::format("reader_c::find_clip_info_file: CLPI file: {0}\n", !clpi_file.empty() ? clpi_file.u8string() : "not found"));
@ -2646,7 +2646,7 @@ reader_c::add_external_files_from_mpls(mm_mpls_multi_file_io_c &mpls_in) {
continue;
auto &item = sub_path.items.front();
auto m2ts = mtx::bluray::find_other_file(mtx::fs::to_path(source_file), mtx::fs::to_path("STREAM") / fmt::format("{0}.m2ts", mtx::fs::to_path(item.clpi_file_name).stem().u8string()));
auto m2ts = mtx::bluray::find_other_file(mtx::fs::to_path(source_file), mtx::fs::to_path("STREAM") / mtx::fs::to_path(fmt::format("{0}.m2ts", mtx::fs::to_path(item.clpi_file_name).stem().u8string())));
mxdebug_if(m_debug_mpls, fmt::format("add_external_files_from_mpls: M2TS for sub_path {0}: {1}\n", sub_path_idx - 1, !m2ts.empty() ? m2ts.u8string() : "not found"));