summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-03-01 16:53:21 +0100
committerCarl Hetherington <cth@carlh.net>2025-03-01 16:53:21 +0100
commit921b3573e25c42ef3e490c00beee07605c9a0a46 (patch)
tree217fb4410cd8794b7e599a5d6000d457599a2600
parent9b980858ef57ca7ff712e3090b5ec94f49964230 (diff)
Use error-catching method to find potential DCPs (#2982).
-rw-r--r--cscript2
-rw-r--r--src/tools/dcpomatic_verifier.cc5
2 files changed, 3 insertions, 4 deletions
diff --git a/cscript b/cscript
index 90bf2d307..8a3fe2f98 100644
--- a/cscript
+++ b/cscript
@@ -427,7 +427,7 @@ def make_spec(filename, version, target, options, requires=None):
print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
def dependencies(target, options):
- deps = [('libdcp', 'v1.10.12', {'c++17': target.platform.startswith('osx')})]
+ deps = [('libdcp', 'v1.10.13', {'c++17': target.platform.startswith('osx')})]
deps.append(('libsub', 'v1.6.53'))
deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
deps.append(('rtaudio', 'f619b76'))
diff --git a/src/tools/dcpomatic_verifier.cc b/src/tools/dcpomatic_verifier.cc
index c8f9d8c8d..55c1387f2 100644
--- a/src/tools/dcpomatic_verifier.cc
+++ b/src/tools/dcpomatic_verifier.cc
@@ -37,6 +37,7 @@
#include "lib/job_manager.h"
#include "lib/verify_dcp_job.h"
#include "lib/util.h"
+#include <dcp/search.h>
#include <dcp/verify_report.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/evtloop.h>
@@ -68,9 +69,7 @@ public:
vector<boost::filesystem::path> get() const
{
- vector<boost::filesystem::path> dcp;
- search(dcp, boost::filesystem::path(wx_to_std(GetPath())));
- return dcp;
+ return dcp::find_potential_dcps(boost::filesystem::path(wx_to_std(GetPath())));
}
void set(boost::filesystem::path)