Fix write_frame_info again.

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

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 44450f7d9fb450173c4232b964472640e90e511d..9cd327a525ff1f0cd56c457bea9a9c5df8ea5db1 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -49,7 +49,7 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c)
        dcp::DCP dcp (c->directory ());
        dcp.read ();
        if (c->kdm ()) {
-               dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_private_key ()));
+               dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_chain()->key().get ()));
        }
        DCPOMATIC_ASSERT (dcp.cpls().size() == 1);
        _reels = dcp.cpls().front()->reels ();
@@ -64,7 +64,7 @@ DCPDecoder::pass ()
        }
 
        double const vfr = _dcp_content->video_frame_rate ();
-       int64_t const frame = _next.frames (vfr);
+       int64_t const frame = _next.frames_round (vfr);
 
        if ((*_reel)->main_picture ()) {
                shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
@@ -127,7 +127,7 @@ DCPDecoder::pass ()
        _next += ContentTime::from_frames (1, vfr);
 
        if ((*_reel)->main_picture ()) {
-               if (_next.frames (vfr) >= (*_reel)->main_picture()->duration()) {
+               if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
                        ++_reel;
                }
        }