From dc5e11944a30a9d381dc0e67cf657c5f2cb65845 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 20 Sep 2022 21:23:40 +0200 Subject: [PATCH] Fix subtitle_file() to find both Interop and SMPTE subtitles. --- test/test.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/test.cc b/test/test.cc index 9261ce43b..f1fd40fb7 100644 --- a/test/test.cc +++ b/test/test.cc @@ -836,13 +836,9 @@ dcp_file (shared_ptr film, string prefix) boost::filesystem::path subtitle_file (shared_ptr film) { - for (auto i: boost::filesystem::directory_iterator(film->directory().get() / film->dcp_name (false))) { - if (boost::filesystem::is_directory(i.path())) { - for (auto j: boost::filesystem::directory_iterator(i.path())) { - if (boost::algorithm::starts_with(j.path().leaf().string(), "sub_")) { - return j.path(); - } - } + for (auto i: boost::filesystem::recursive_directory_iterator(film->directory().get() / film->dcp_name(false))) { + if (boost::algorithm::starts_with(i.path().leaf().string(), "sub_")) { + return i.path(); } } -- 2.30.2