diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/smpte_text_asset.cc | 6 | ||||
| -rw-r--r-- | src/util.cc | 15 | ||||
| -rw-r--r-- | src/util.h | 13 |
3 files changed, 1 insertions, 33 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; diff --git a/src/util.cc b/src/util.cc index 8ad90dbf..77493ffa 100644 --- a/src/util.cc +++ b/src/util.cc @@ -410,21 +410,6 @@ dcp::unique_string (vector<string> existing, string base) } -ASDCPErrorSuspender::ASDCPErrorSuspender () - : _old (Kumu::DefaultLogSink()) -{ - _sink = new Kumu::EntryListLogSink(_log); - Kumu::SetDefaultLogSink (_sink); -} - - -ASDCPErrorSuspender::~ASDCPErrorSuspender () -{ - Kumu::SetDefaultLogSink (&_old); - delete _sink; -} - - boost::filesystem::path dcp::directory_containing_executable () { #if BOOST_VERSION >= 106100 @@ -153,19 +153,6 @@ extern boost::filesystem::path directory_containing_executable (); extern boost::filesystem::path resources_directory (); -class ASDCPErrorSuspender -{ -public: - ASDCPErrorSuspender(); - ~ASDCPErrorSuspender(); - -private: - Kumu::LogEntryList _log; - Kumu::ILogSink& _old; - Kumu::EntryListLogSink* _sink; -}; - - template <class From, class To> void add_to_container(To& container, From source) |