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 f5f21f2eac92e5799a901370ecd44c394d654ee2..7ed79d818128ecf1a1f34553e2f57e0683ec1ae3 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -60,9 +60,14 @@ using std::string;
 using std::cout;
 using std::exception;
 using std::map;
+using std::vector;
 using boost::shared_ptr;
 using boost::optional;
 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;
@@ -155,7 +160,7 @@ ReelWriter::ReelWriter (
 
        if (_film->audio_channels ()) {
                _sound_asset.reset (
-                       new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels (), standard)
+                       new dcp::SoundAsset (dcp::Fraction(_film->video_frame_rate(), 1), _film->audio_frame_rate(), _film->audio_channels(), _film->audio_language(), standard)
                        );
 
                _sound_asset->set_metadata (mxf_metadata());
@@ -166,11 +171,17 @@ ReelWriter::ReelWriter (
 
                DCPOMATIC_ASSERT (_film->directory());
 
+               vector<dcp::Channel> active;
+               BOOST_FOREACH (int i, _film->mapped_audio_channels()) {
+                       active.push_back (static_cast<dcp::Channel>(i));
+               }
+
                /* Write the sound asset into the film directory so that we leave the creation
                   of the DCP directory until the last minute.
                */
                _sound_asset_writer = _sound_asset->start_write (
                        _film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary),
+                       active,
                        _film->contains_atmos_content()
                        );
        }
@@ -279,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;
 }
@@ -328,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);
@@ -752,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);