libdcp API change ReelMXF -> ReelFileAsset.

diff --git a/cscript b/cscript
index 2b0457381f47d201c02dc7f927e194dce5526a5a..fdc30cf1ccadd65ebd8316c7822b6b973c2173f8 100644 (file)
--- a/cscript
+++ b/cscript
@@ -370,8 +370,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'ac98ff1'))
-    deps.append(('libsub', '8115d0f'))
+    deps.append(('libdcp', 'f888263'))
+    deps.append(('libsub', 'b5ad46d'))
     deps.append(('leqm-nrt', '131f971'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 8a165586cff07e2741206f7397a77be2e850d088..dacde49d4964283bfa1ea6e182e333a606c34af1 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -64,7 +64,7 @@
 #include <dcp/local_time.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/raw_convert.h>
-#include <dcp/reel_mxf.h>
+#include <dcp/reel_file_asset.h>
 #include <dcp/reel_asset.h>
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
@@ -1645,9 +1645,9 @@ Film::make_kdm (
                }
        }
 
-       map<shared_ptr<const dcp::ReelMXF>, dcp::Key> keys;
+       map<shared_ptr<const dcp::ReelFileAsset>, dcp::Key> keys;
 
-       for (auto i: cpl->reel_mxfs()) {
+       for (auto i: cpl->reel_file_assets()) {
                if (!i->key_id()) {
                        continue;
                }

diff --git a/src/lib/types.cc b/src/lib/types.cc
index ac7920a2c05e8d960c57df641b51cdf86d86532f..177b5e5815875737008f60f6c12f27243f27b842 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -25,7 +25,7 @@
 #include <dcp/raw_convert.h>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/reel_mxf.h>
+#include <dcp/reel_file_asset.h>
 #include <dcp/reel_asset.h>
 DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
@@ -213,7 +213,7 @@ CPLSummary::CPLSummary (boost::filesystem::path p)
 
        encrypted = false;
        for (auto j: dcp.cpls()) {
-               for (auto k: j->reel_mxfs()) {
+               for (auto k: j->reel_file_assets()) {
                        if (k->key_id()) {
                                encrypted = true;
                        }

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 140f54a6fd7a77e25e96e15f6e74a779925f613b..6518caea915d369edae44f52a4682e42afbbdac6 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));
        }
@@ -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());
                }
        }
 }