Change end() to only do one thing, and copy the required stuff into pause()

[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 3e62c96a3b9ac4750d34c26600819bc7c050d125..669fc8ac9df9313b814be9fd710626f8f415b864 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.
 
@@ -18,25 +18,25 @@
 
 */
 
+
+#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)
 {
        auto name = dcp->name ();
        name = name.substr (0, name.find("_"));
@@ -61,12 +61,17 @@ copy_dcp_details_to_film (shared_ptr<const DCPContent> dcp, shared_ptr<Film> fil
                film->set_audio_channels (dcp->audio->stream()->channels());
        }
 
+       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()));
+               film->set_marker(i.first, dcpomatic::DCPTime(i.second.get()));
        }
-
-       film->set_ratings (dcp->ratings());
-       film->set_content_versions (dcp->content_versions());
 }