projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use 2.18.x subdirectory for configuration.
[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 206475ed6965b59300bfd4306bebdc2c9ae17977..669fc8ac9df9313b814be9fd710626f8f415b864 100644
(file)
--- 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_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->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());
}
}