Fix font_id_map errors when importing DCP subtitles that have no

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

diff --git a/src/lib/copy_dcp_details_to_film.cc b/src/lib/copy_dcp_details_to_film.cc
index c33b0974baf536c59c78b1526c68d325a628a65d..5c3c79638b877ef00d6f358fa7c5115a6a8a5167 100644 (file)
--- a/src/lib/copy_dcp_details_to_film.cc
+++ b/src/lib/copy_dcp_details_to_film.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -26,20 +26,19 @@
 #include "audio_content.h"
 #include "ratio.h"
 #include "dcp_content_type.h"
-#include <boost/shared_ptr.hpp>
 #include <map>
 
 
 using std::map;
 using std::string;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 void
 copy_dcp_details_to_film (shared_ptr<const DCPContent> dcp, shared_ptr<Film> film)
 {
-       string name = dcp->name ();
+       auto name = dcp->name ();
        name = name.substr (0, name.find("_"));
        film->set_name (name);
        film->set_use_isdcf_name (true);
@@ -47,8 +46,8 @@ copy_dcp_details_to_film (shared_ptr<const DCPContent> dcp, shared_ptr<Film> fil
                film->set_dcp_content_type (DCPContentType::from_libdcp_kind(dcp->content_kind().get()));
        }
        film->set_encrypted (dcp->encrypted());
-       film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
-       film->set_interop (dcp->standard() == dcp::INTEROP);
+       film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
+       film->set_interop (dcp->standard() == dcp::Standard::INTEROP);
        film->set_three_d (dcp->three_d());
 
        if (dcp->video) {
@@ -62,11 +61,9 @@ copy_dcp_details_to_film (shared_ptr<const DCPContent> dcp, shared_ptr<Film> fil
                film->set_audio_channels (dcp->audio->stream()->channels());
        }
 
-       map<dcp::Marker, dcpomatic::ContentTime> dcp_markers;
-       map<dcp::Marker, dcpomatic::DCPTime> film_markers;
        film->clear_markers ();
-       for (map<dcp::Marker, dcpomatic::ContentTime>::const_iterator i = dcp_markers.begin(); i != dcp_markers.end(); ++i) {
-               film->set_marker (i->first, dcpomatic::DCPTime(i->second.get()));
+       for (auto const& i: dcp->markers()) {
+               film->set_marker (i.first, dcpomatic::DCPTime(i.second.get()));
        }
 
        film->set_ratings (dcp->ratings());