Fix unnecessary condition.

[dcpomatic.git] / src / lib / reel_writer.cc

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index a42c6182ab5fc37bf758a5c014a145a7def45060..7ed79d818128ecf1a1f34553e2f57e0683ec1ae3 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -67,6 +67,7 @@ using boost::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
+using dcp::ArrayData;
 using dcp::Data;
 using dcp::raw_convert;
 using namespace dcpomatic;
@@ -289,14 +290,14 @@ ReelWriter::check_existing_picture_asset (boost::filesystem::path asset)
 }
 
 void
-ReelWriter::write (optional<Data> encoded, Frame frame, Eyes eyes)
+ReelWriter::write (shared_ptr<const Data> encoded, Frame frame, Eyes eyes)
 {
        if (!_picture_asset_writer) {
                /* We're not writing any data */
                return;
        }
 
-       dcp::FrameInfo fin = _picture_asset_writer->write (encoded->data().get (), encoded->size());
+       dcp::FrameInfo fin = _picture_asset_writer->write (encoded->data(), encoded->size());
        write_frame_info (frame, eyes, fin);
        _last_written[eyes] = encoded;
 }
@@ -338,7 +339,7 @@ ReelWriter::repeat_write (Frame frame, Eyes eyes)
        }
 
        dcp::FrameInfo fin = _picture_asset_writer->write (
-               _last_written[eyes]->data().get(),
+               _last_written[eyes]->data(),
                _last_written[eyes]->size()
                );
        write_frame_info (frame, eyes, fin);
@@ -762,15 +763,15 @@ ReelWriter::existing_picture_frame_ok (FILE* asset_file, shared_ptr<InfoFileHand
 
        /* Read the data from the asset and hash it */
        dcpomatic_fseek (asset_file, info.offset, SEEK_SET);
-       Data data (info.size);
-       size_t const read = fread (data.data().get(), 1, data.size(), asset_file);
+       ArrayData data (info.size);
+       size_t const read = fread (data.data(), 1, data.size(), asset_file);
        LOG_GENERAL ("Read %1 bytes of asset data; wanted %2", read, info.size);
        if (read != static_cast<size_t> (data.size ())) {
                LOG_GENERAL ("Existing frame %1 is incomplete", frame);
                ok = false;
        } else {
                Digester digester;
-               digester.add (data.data().get(), data.size());
+               digester.add (data.data(), data.size());
                LOG_GENERAL ("Hash %1 vs %2", digester.get(), info.hash);
                if (digester.get() != info.hash) {
                        LOG_GENERAL ("Existing frame %1 failed hash check", frame);