diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-17 14:30:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-17 14:30:21 +0100 |
| commit | 34f2b95c1638a2cfedf21de5a203d6c0b77abf11 (patch) | |
| tree | bd78b7dbca7d975a89ef9628f6d4b2fd783a39f1 /src/smpte_subtitle_asset.cc | |
| parent | 81ed0ebb725a7b5fec00ae209ba8b0d70ebc4ee1 (diff) | |
Use an optional<> where there should be one.
Diffstat (limited to 'src/smpte_subtitle_asset.cc')
| -rw-r--r-- | src/smpte_subtitle_asset.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc index 239fff74..c58162b3 100644 --- a/src/smpte_subtitle_asset.cc +++ b/src/smpte_subtitle_asset.cc @@ -80,7 +80,7 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file) shared_ptr<cxml::Document> xml (new cxml::Document ("SubtitleReel")); shared_ptr<ASDCP::TimedText::MXFReader> reader (new ASDCP::TimedText::MXFReader ()); - Kumu::Result_t r = reader->OpenRead (_file.string().c_str ()); + Kumu::Result_t r = reader->OpenRead (_file->string().c_str ()); if (!ASDCP_FAILURE (r)) { /* MXF-wrapped */ ASDCP::WriterInfo info; @@ -201,7 +201,7 @@ SMPTESubtitleAsset::set_key (Key key) { MXF::set_key (key); - if (!_key_id || _file.empty()) { + if (!_key_id || !_file) { /* Either we don't have any data to read, or it wasn't encrypted, so we don't need to do anything else. */ @@ -211,11 +211,11 @@ SMPTESubtitleAsset::set_key (Key key) /* Our data was encrypted; now we can decrypt it */ shared_ptr<ASDCP::TimedText::MXFReader> reader (new ASDCP::TimedText::MXFReader ()); - Kumu::Result_t r = reader->OpenRead (_file.string().c_str ()); + Kumu::Result_t r = reader->OpenRead (_file->string().c_str ()); if (ASDCP_FAILURE (r)) { boost::throw_exception ( DCPReadError ( - String::compose ("Could not read encrypted subtitle MXF (%1)", _file, static_cast<int> (r)) + String::compose ("Could not read encrypted subtitle MXF (%1)", static_cast<int> (r)) ) ); } |