Tell user we need a KDM when we have none, and content is encrypted.

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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 8c5a8241505daacd5066332f00fcf201b7eec22b..e47fa973b8841b21c5cfdebdba8784f770b51123 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -38,7 +38,7 @@
 #include "text_content.h"
 #include <dcp/cpl.h>
 #include <dcp/locale_convert.h>
-#include <dcp/reel_mxf.h>
+#include <dcp/reel_file_asset.h>
 #include <fstream>
 #include <cerrno>
 #include <iostream>
@@ -99,7 +99,7 @@ Writer::Writer (weak_ptr<const Film> weak_film, weak_ptr<Job> j, bool text_only)
        shared_ptr<Job> job = _job.lock ();
 
        int reel_index = 0;
-       list<DCPTimePeriod> const reels = film()->reels();
+       auto const reels = film()->reels();
        for (auto p: reels) {
                _reels.push_back (ReelWriter(weak_film, p, job, reel_index++, reels.size(), text_only));
        }
@@ -165,12 +165,12 @@ Writer::write (shared_ptr<const Data> encoded, Frame frame, Eyes eyes)
        qi.reel = video_reel (frame);
        qi.frame = frame - _reels[qi.reel].start ();
 
-       if (film()->three_d() && eyes == EYES_BOTH) {
+       if (film()->three_d() && eyes == Eyes::BOTH) {
                /* 2D material in a 3D DCP; fake the 3D */
-               qi.eyes = EYES_LEFT;
+               qi.eyes = Eyes::LEFT;
                _queue.push_back (qi);
                ++_queued_full_in_memory;
-               qi.eyes = EYES_RIGHT;
+               qi.eyes = Eyes::RIGHT;
                _queue.push_back (qi);
                ++_queued_full_in_memory;
        } else {
@@ -210,10 +210,10 @@ Writer::repeat (Frame frame, Eyes eyes)
        qi.type = QueueItem::REPEAT;
        qi.reel = video_reel (frame);
        qi.frame = frame - _reels[qi.reel].start ();
-       if (film()->three_d() && eyes == EYES_BOTH) {
-               qi.eyes = EYES_LEFT;
+       if (film()->three_d() && eyes == Eyes::BOTH) {
+               qi.eyes = Eyes::LEFT;
                _queue.push_back (qi);
-               qi.eyes = EYES_RIGHT;
+               qi.eyes = Eyes::RIGHT;
                _queue.push_back (qi);
        } else {
                qi.eyes = eyes;
@@ -250,10 +250,10 @@ Writer::fake_write (Frame frame, Eyes eyes)
 
        qi.reel = reel;
        qi.frame = frame_in_reel;
-       if (film()->three_d() && eyes == EYES_BOTH) {
-               qi.eyes = EYES_LEFT;
+       if (film()->three_d() && eyes == Eyes::BOTH) {
+               qi.eyes = Eyes::LEFT;
                _queue.push_back (qi);
-               qi.eyes = EYES_RIGHT;
+               qi.eyes = Eyes::RIGHT;
                _queue.push_back (qi);
        } else {
                qi.eyes = eyes;
@@ -355,18 +355,18 @@ Writer::have_sequenced_image_at_queue_head ()
 bool
 Writer::LastWritten::next (QueueItem qi) const
 {
-       if (qi.eyes == EYES_BOTH) {
+       if (qi.eyes == Eyes::BOTH) {
                /* 2D */
                return qi.frame == (_frame + 1);
        }
 
        /* 3D */
 
-       if (_eyes == EYES_LEFT && qi.frame == _frame && qi.eyes == EYES_RIGHT) {
+       if (_eyes == Eyes::LEFT && qi.frame == _frame && qi.eyes == Eyes::RIGHT) {
                return true;
        }
 
-       if (_eyes == EYES_RIGHT && qi.frame == (_frame + 1) && qi.eyes == EYES_LEFT) {
+       if (_eyes == Eyes::RIGHT && qi.frame == (_frame + 1) && qi.eyes == Eyes::LEFT) {
                return true;
        }
 
@@ -623,15 +623,15 @@ Writer::finish (boost::filesystem::path output_dcp)
        cpl->set_facility (film()->facility());
        cpl->set_luminance (film()->luminance());
 
-       list<int> ac = film()->mapped_audio_channels();
+       auto ac = film()->mapped_audio_channels();
        dcp::MCASoundField field = (
-               find(ac.begin(), ac.end(), static_cast<int>(dcp::BSL)) != ac.end() ||
-               find(ac.begin(), ac.end(), static_cast<int>(dcp::BSR)) != ac.end()
-               ) ? dcp::SEVEN_POINT_ONE : dcp::FIVE_POINT_ONE;
+               find(ac.begin(), ac.end(), static_cast<int>(dcp::Channel::BSL)) != ac.end() ||
+               find(ac.begin(), ac.end(), static_cast<int>(dcp::Channel::BSR)) != ac.end()
+               ) ? dcp::MCASoundField::SEVEN_POINT_ONE : dcp::MCASoundField::FIVE_POINT_ONE;
 
        dcp::MainSoundConfiguration msc (field, film()->audio_channels());
        for (auto i: ac) {
-               if (i < film()->audio_channels()) {
+               if (static_cast<int>(i) < film()->audio_channels()) {
                        msc.set_mapping (i, static_cast<dcp::Channel>(i));
                }
        }
@@ -655,11 +655,11 @@ Writer::finish (boost::filesystem::path output_dcp)
        }
 
        dcp.write_xml (
-               film()->interop() ? dcp::INTEROP : dcp::SMPTE,
+               film()->interop() ? dcp::Standard::INTEROP : dcp::Standard::SMPTE,
                issuer,
                creator,
                dcp::LocalTime().as_string(),
-               String::compose("Created by libdcp %1", dcp::version),
+               film()->dcp_name(),
                signer,
                Config::instance()->dcp_metadata_filename_format()
                );
@@ -760,18 +760,18 @@ Writer::can_fake_write (Frame frame) const
        return (frame != 0 && frame < reel.first_nonexistant_frame());
 }
 
-/** @param track Closed caption track if type == TEXT_CLOSED_CAPTION */
+/** @param track Closed caption track if type == TextType::CLOSED_CAPTION */
 void
 Writer::write (PlayerText text, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-       vector<ReelWriter>::iterator* reel = 0;
+       vector<ReelWriter>::iterator* reel = nullptr;
 
        switch (type) {
-       case TEXT_OPEN_SUBTITLE:
+       case TextType::OPEN_SUBTITLE:
                reel = &_subtitle_reel;
                _have_subtitles = true;
                break;
-       case TEXT_CLOSED_CAPTION:
+       case TextType::CLOSED_CAPTION:
                DCPOMATIC_ASSERT (track);
                DCPOMATIC_ASSERT (_caption_reels.find(*track) != _caption_reels.end());
                reel = &_caption_reels[*track];
@@ -846,7 +846,7 @@ Writer::write (ReferencedReelAsset asset)
 size_t
 Writer::video_reel (int frame) const
 {
-       DCPTime t = DCPTime::from_frames (frame, film()->video_frame_rate());
+       auto t = DCPTime::from_frames (frame, film()->video_frame_rate());
        size_t i = 0;
        while (i < _reels.size() && !_reels[i].period().contains (t)) {
                ++i;
@@ -863,8 +863,8 @@ Writer::set_digest_progress (Job* job, float progress)
 
        _digest_progresses[boost::this_thread::get_id()] = progress;
        float min_progress = FLT_MAX;
-       for (map<boost::thread::id, float>::const_iterator i = _digest_progresses.begin(); i != _digest_progresses.end(); ++i) {
-               min_progress = min (min_progress, i->second);
+       for (auto const& i: _digest_progresses) {
+               min_progress = min (min_progress, i.second);
        }
 
        job->set_progress (min_progress);
@@ -879,10 +879,10 @@ void
 Writer::calculate_referenced_digests (boost::function<void (float)> set_progress)
 {
        for (auto const& i: _reel_assets) {
-               shared_ptr<dcp::ReelMXF> mxf = dynamic_pointer_cast<dcp::ReelMXF>(i.asset);
-               if (mxf && !mxf->hash()) {
-                       mxf->asset_ref().asset()->hash (set_progress);
-                       mxf->set_hash (mxf->asset_ref().asset()->hash());
+               auto file = dynamic_pointer_cast<dcp::ReelFileAsset>(i.asset);
+               if (file && !file->hash()) {
+                       file->asset_ref().asset()->hash (set_progress);
+                       file->set_hash (file->asset_ref().asset()->hash());
                }
        }
 }