Use enum class for VideoRange.

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

diff --git a/src/lib/types.cc b/src/lib/types.cc
index 5687a5d48b070c261a7559f03a945d8442fc6d6a..840ee3aa8b5608fb9ff946f04efdffa22c4f6eb9 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -25,13 +25,12 @@
 #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>
 DCPOMATIC_ENABLE_WARNINGS
 #include <libcxml/cxml.h>
-#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
@@ -39,7 +38,8 @@ using std::max;
 using std::min;
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::vector;
 using dcp::raw_convert;
 
 bool operator== (Crop const & a, Crop const & b)
@@ -198,10 +198,10 @@ CPLSummary::CPLSummary (boost::filesystem::path p)
 {
        dcp::DCP dcp (p);
 
-       list<dcp::VerificationNote> notes;
+       vector<dcp::VerificationNote> notes;
        dcp.read (&notes);
-       BOOST_FOREACH (dcp::VerificationNote i, notes) {
-               if (i.code() != dcp::VerificationNote::EXTERNAL_ASSET) {
+       for (auto i: notes) {
+               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,8 +212,8 @@ CPLSummary::CPLSummary (boost::filesystem::path p)
        cpl_file = dcp.cpls().front()->file().get();
 
        encrypted = false;
-       BOOST_FOREACH (shared_ptr<dcp::CPL> j, dcp.cpls()) {
-               BOOST_FOREACH (shared_ptr<const dcp::ReelMXF> k, j->reel_mxfs()) {
+       for (auto j: dcp.cpls()) {
+               for (auto k: j->reel_file_assets()) {
                        if (k->key_id()) {
                                encrypted = true;
                        }
@@ -234,9 +234,9 @@ string
 video_range_to_string (VideoRange r)
 {
        switch (r) {
-       case VIDEO_RANGE_FULL:
+       case VideoRange::FULL:
                return "full";
-       case VIDEO_RANGE_VIDEO:
+       case VideoRange::VIDEO:
                return "video";
        default:
                DCPOMATIC_ASSERT (false);
@@ -248,12 +248,12 @@ VideoRange
 string_to_video_range (string s)
 {
        if (s == "full") {
-               return VIDEO_RANGE_FULL;
+               return VideoRange::FULL;
        } else if (s == "video") {
-               return VIDEO_RANGE_VIDEO;
+               return VideoRange::VIDEO;
        }
 
        DCPOMATIC_ASSERT (false);
-       return VIDEO_RANGE_FULL;
+       return VideoRange::FULL;
 }