summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/copy_dcp_details_to_film.cc13
-rw-r--r--src/lib/copy_dcp_details_to_film.h1
2 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/copy_dcp_details_to_film.cc b/src/lib/copy_dcp_details_to_film.cc
index 206475ed6..669fc8ac9 100644
--- a/src/lib/copy_dcp_details_to_film.cc
+++ b/src/lib/copy_dcp_details_to_film.cc
@@ -61,12 +61,17 @@ copy_dcp_settings_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());
}
diff --git a/src/lib/copy_dcp_details_to_film.h b/src/lib/copy_dcp_details_to_film.h
index 99f9cdeb7..0948cbec1 100644
--- a/src/lib/copy_dcp_details_to_film.h
+++ b/src/lib/copy_dcp_details_to_film.h
@@ -27,3 +27,4 @@ class Film;
extern void copy_dcp_settings_to_film(std::shared_ptr<const DCPContent> dcp, std::shared_ptr<Film> film);
+extern void copy_dcp_markers_to_film(std::shared_ptr<const DCPContent> dcp, std::shared_ptr<Film> film);