*/
+
+#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("_"));
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());
}