libdcp API change ReelMXF -> ReelFileAsset.

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

diff --git a/src/lib/types.cc b/src/lib/types.cc
index 68d97b8ff614b84617fc1779e9747da5ebf54b47..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>
@@ -39,6 +39,7 @@ using std::min;
 using std::string;
 using std::list;
 using std::shared_ptr;
+using std::vector;
 using dcp::raw_convert;
 
 bool operator== (Crop const & a, Crop const & b)
@@ -197,10 +198,10 @@ CPLSummary::CPLSummary (boost::filesystem::path p)
 {
        dcp::DCP dcp (p);
 
-       list<dcp::VerificationNote> notes;
+       vector<dcp::VerificationNote> notes;
        dcp.read (&notes);
        for (auto i: notes) {
-               if (i.code() != dcp::VerificationNote::EXTERNAL_ASSET) {
+               if (i.code() != dcp::VerificationNote::Code::EXTERNAL_ASSET) {
                        /* It's not just a warning about this DCP being a VF */
                        throw dcp::ReadError(dcp::note_to_string(i));
                }
@@ -212,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;
                        }