summaryrefslogtreecommitdiff
path: root/src/smpte_text_asset.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-10-20 21:16:49 +0200
committerCarl Hetherington <cth@carlh.net>2025-10-20 21:16:49 +0200
commita8d449a0a35f205833b446aeae66564aa2464736 (patch)
treebbc4b45b3e216c75d88131761215fdcd03d4a256 /src/smpte_text_asset.cc
parent219776f17374c273d4da176c262e8c7ec7b1329b (diff)
Remove ASDCPErrorSuspender.v1.10.34
I think it's not possible to do this thread-safely without quite noisy changes to asdcplib: DefaultLogSink() refers a reference which can be deleted by ASDCPErrorSuspender before it is used. DefaultLogSink() could return a shared_ptr but there's a lot of callsites.
Diffstat (limited to 'src/smpte_text_asset.cc')
-rw-r--r--src/smpte_text_asset.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/smpte_text_asset.cc b/src/smpte_text_asset.cc
index 02ea9a16..63e8c8ab 100644
--- a/src/smpte_text_asset.cc
+++ b/src/smpte_text_asset.cc
@@ -98,11 +98,7 @@ SMPTETextAsset::SMPTETextAsset(boost::filesystem::path file)
Kumu::FileReaderFactory factory;
auto reader = make_shared<ASDCP::TimedText::MXFReader>(factory);
- auto r = Kumu::RESULT_OK;
- {
- ASDCPErrorSuspender sus;
- r = reader->OpenRead(dcp::filesystem::fix_long_path(*_file).string().c_str());
- }
+ auto const r = reader->OpenRead(dcp::filesystem::fix_long_path(*_file).string().c_str());
if (!ASDCP_FAILURE(r)) {
/* MXF-wrapped */
ASDCP::WriterInfo info;