X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcopy_dcp_details_to_film.cc;h=669fc8ac9df9313b814be9fd710626f8f415b864;hb=c5b966261b7b268f495d7a72b7af4d4e6a75e618;hp=64a38c3353832e81538c67917b3ad3d0cdeb219a;hpb=28111007e2e6fd62f5810be780706ae1618bd33f;p=dcpomatic.git

diff --git a/src/lib/copy_dcp_details_to_film.cc b/src/lib/copy_dcp_details_to_film.cc
index 64a38c335..669fc8ac9 100644
--- 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.
 
@@ -18,27 +18,27 @@
 
 */
 
+
+#include "audio_content.h"
 #include "copy_dcp_details_to_film.h"
 #include "dcp_content.h"
+#include "dcp_content_type.h"
 #include "film.h"
-#include "types.h"
-#include "video_content.h"
-#include "audio_content.h"
 #include "ratio.h"
-#include "dcp_content_type.h"
+#include "video_content.h"
 #include <map>
 
 
 using std::map;
+using std::shared_ptr;
 using std::string;
 using std::vector;
-using std::shared_ptr;
 
 
 void
-copy_dcp_details_to_film (shared_ptr<const DCPContent> dcp, shared_ptr<Film> film)
+copy_dcp_settings_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);
@@ -46,7 +46,7 @@ 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_reel_type (ReelType::BY_VIDEO_CONTENT);
 	film->set_interop (dcp->standard() == dcp::Standard::INTEROP);
 	film->set_three_d (dcp->three_d());
 
@@ -61,14 +61,17 @@ 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()));
-	}
-
 	film->set_ratings (dcp->ratings());
 	film->set_content_versions (dcp->content_versions());
 }
 
+
+void
+copy_dcp_markers_to_film(shared_ptr<const DCPContent> dcp, shared_ptr<Film> film)
+{
+	film->clear_markers ();
+	for (auto const& i: dcp->markers()) {
+		film->set_marker(i.first, dcpomatic::DCPTime(i.second.get()));
+	}
+}
+