/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <boost/date_time.hpp>
#include <libxml++/libxml++.h>
#include <libcxml/cxml.h>
+#include <libdcp/signer_chain.h>
+#include <libdcp/cpl.h>
+#include <libdcp/signer.h>
+#include <libdcp/util.h>
+#include <libdcp/kdm.h>
#include "film.h"
#include "job.h"
-#include "filter.h"
#include "util.h"
#include "job_manager.h"
#include "transcode_job.h"
#include "ui_signaller.h"
#include "playlist.h"
#include "player.h"
-#include "ffmpeg_content.h"
-#include "imagemagick_content.h"
-#include "sndfile_content.h"
#include "dcp_content_type.h"
#include "ratio.h"
#include "cross.h"
+#include "cinema.h"
#include "i18n.h"
using boost::starts_with;
using boost::optional;
using libdcp::Size;
+using libdcp::Signer;
int const Film::state_version = 4;
/** Construct a Film object in a given directory.
*
- * @param d Film directory.
+ * @param dir Film directory.
*/
-Film::Film (string d)
+Film::Film (boost::filesystem::path dir)
: _playlist (new Playlist)
, _use_dci_name (true)
, _dcp_content_type (Config::instance()->default_dcp_content_type ())
, _container (Config::instance()->default_container ())
+ , _resolution (RESOLUTION_2K)
, _scaler (Scaler::from_id ("bicubic"))
, _with_subtitles (false)
- , _colour_lut (0)
- , _j2k_bandwidth (200000000)
+ , _encrypted (false)
+ , _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ())
, _dci_metadata (Config::instance()->default_dci_metadata ())
- , _dcp_video_frame_rate (24)
- , _dcp_audio_channels (MAX_AUDIO_CHANNELS)
+ , _video_frame_rate (24)
+ , _audio_channels (MAX_AUDIO_CHANNELS)
+ , _three_d (false)
+ , _sequence_video (true)
+ , _interop (false)
, _dirty (false)
{
set_dci_date_today ();
(Code swiped from Adam Bowen on stackoverflow)
*/
- boost::filesystem::path p (boost::filesystem::system_complete (d));
+ boost::filesystem::path p (boost::filesystem::system_complete (dir));
boost::filesystem::path result;
for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) {
if (*i == "..") {
}
}
- set_directory (result.string ());
- _log.reset (new FileLog ("log"));
-}
-
-Film::Film (Film const & o)
- : boost::enable_shared_from_this<Film> (o)
- /* note: the copied film shares the original's log */
- , _log (o._log)
- , _playlist (new Playlist (o._playlist))
- , _directory (o._directory)
- , _name (o._name)
- , _use_dci_name (o._use_dci_name)
- , _dcp_content_type (o._dcp_content_type)
- , _container (o._container)
- , _scaler (o._scaler)
- , _with_subtitles (o._with_subtitles)
- , _colour_lut (o._colour_lut)
- , _j2k_bandwidth (o._j2k_bandwidth)
- , _dci_metadata (o._dci_metadata)
- , _dcp_video_frame_rate (o._dcp_video_frame_rate)
- , _dci_date (o._dci_date)
- , _dirty (o._dirty)
-{
- _playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2));
+ set_directory (result);
+ _log.reset (new FileLog (file ("log")));
+
+ _playlist->set_sequence_video (_sequence_video);
}
string
-Film::video_state_identifier () const
+Film::video_identifier () const
{
assert (container ());
LocaleGuard lg;
stringstream s;
s << container()->id()
- << "_" << _playlist->video_digest()
- << "_" << _dcp_video_frame_rate
+ << "_" << resolution_to_string (_resolution)
+ << "_" << _playlist->video_identifier()
+ << "_" << _video_frame_rate
<< "_" << scaler()->id()
- << "_" << j2k_bandwidth()
- << "_" << lexical_cast<int> (colour_lut());
+ << "_" << j2k_bandwidth();
+
+ if (_interop) {
+ s << "_I";
+ } else {
+ s << "_S";
+ }
+
+ if (_three_d) {
+ s << "_3D";
+ }
return s.str ();
}
/** @return The path to the directory to write video frame info files to */
-string
+boost::filesystem::path
Film::info_dir () const
{
boost::filesystem::path p;
p /= "info";
- p /= video_state_identifier ();
- return dir (p.string());
+ p /= video_identifier ();
+ return dir (p);
}
-string
+boost::filesystem::path
Film::internal_video_mxf_dir () const
{
return dir ("video");
}
-string
+boost::filesystem::path
Film::internal_video_mxf_filename () const
{
- return video_state_identifier() + ".mxf";
+ return video_identifier() + ".mxf";
}
-string
-Film::dcp_video_mxf_filename () const
+boost::filesystem::path
+Film::video_mxf_filename () const
{
return filename_safe_name() + "_video.mxf";
}
-string
-Film::dcp_audio_mxf_filename () const
+boost::filesystem::path
+Film::audio_mxf_filename () const
{
return filename_safe_name() + "_audio.mxf";
}
gethostname (buffer, sizeof (buffer));
log()->log (String::compose ("Starting to make DCP on %1", buffer));
}
-
-// log()->log (String::compose ("Content is %1; type %2", content_path(), (content_type() == STILL ? _("still") : _("video"))));
-// if (length()) {
-// log()->log (String::compose ("Content length %1", length().get()));
-// }
-// log()->log (String::compose ("Content digest %1", content_digest()));
-// log()->log (String::compose ("Content at %1 fps, DCP at %2 fps", source_frame_rate(), dcp_frame_rate()));
+
+ ContentList cl = content ();
+ for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) {
+ log()->log (String::compose ("Content: %1", (*i)->technical_summary()));
+ }
+ log()->log (String::compose ("DCP video rate %1 fps", video_frame_rate()));
log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
#ifdef DCPOMATIC_DEBUG
#else
log()->log ("libdcp built in optimised mode.");
#endif
- pair<string, int> const c = cpu_info ();
- log()->log (String::compose ("CPU: %1, %2 processors", c.first, c.second));
+ log()->log (String::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency ()));
list<pair<string, string> > const m = mount_info ();
for (list<pair<string, string> >::const_iterator i = m.begin(); i != m.end(); ++i) {
log()->log (String::compose ("Mount: %1 %2", i->first, i->second));
throw MissingSettingError (_("container"));
}
- if (_playlist->content().empty ()) {
+ if (content().empty()) {
throw StringError (_("You must add some content to the DCP before creating it"));
}
void
Film::write_metadata () const
{
- if (!boost::filesystem::exists (directory())) {
- boost::filesystem::create_directory (directory());
+ if (!boost::filesystem::exists (directory ())) {
+ boost::filesystem::create_directory (directory ());
}
- boost::mutex::scoped_lock lm (_state_mutex);
LocaleGuard lg;
- boost::filesystem::create_directories (directory());
+ boost::filesystem::create_directories (directory ());
xmlpp::Document doc;
xmlpp::Element* root = doc.create_root_node ("Metadata");
root->add_child("Container")->add_child_text (_container->id ());
}
+ root->add_child("Resolution")->add_child_text (resolution_to_string (_resolution));
root->add_child("Scaler")->add_child_text (_scaler->id ());
root->add_child("WithSubtitles")->add_child_text (_with_subtitles ? "1" : "0");
- root->add_child("ColourLUT")->add_child_text (lexical_cast<string> (_colour_lut));
root->add_child("J2KBandwidth")->add_child_text (lexical_cast<string> (_j2k_bandwidth));
_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
- root->add_child("DCPVideoFrameRate")->add_child_text (lexical_cast<string> (_dcp_video_frame_rate));
+ root->add_child("VideoFrameRate")->add_child_text (lexical_cast<string> (_video_frame_rate));
root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date));
- root->add_child("DCPAudioChannels")->add_child_text (lexical_cast<string> (_dcp_audio_channels));
+ root->add_child("AudioChannels")->add_child_text (lexical_cast<string> (_audio_channels));
+ root->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
+ root->add_child("SequenceVideo")->add_child_text (_sequence_video ? "1" : "0");
+ root->add_child("Interop")->add_child_text (_interop ? "1" : "0");
+ root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
+ root->add_child("Key")->add_child_text (_key.hex ());
_playlist->as_xml (root->add_child ("Playlist"));
- doc.write_to_file_formatted (file ("metadata.xml"));
+ doc.write_to_file_formatted (file("metadata.xml").string ());
_dirty = false;
}
void
Film::read_metadata ()
{
- boost::mutex::scoped_lock lm (_state_mutex);
LocaleGuard lg;
if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file ("metadata.xml"))) {
throw StringError (_("This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version. You will need to create a new Film, re-add your content and set it up again. Sorry!"));
}
- cxml::File f (file ("metadata.xml"), "Metadata");
+ cxml::Document f ("Metadata");
+ f.read_file (file ("metadata.xml"));
_name = f.string_child ("Name");
_use_dci_name = f.bool_child ("UseDCIName");
}
}
+ _resolution = string_to_resolution (f.string_child ("Resolution"));
_scaler = Scaler::from_id (f.string_child ("Scaler"));
_with_subtitles = f.bool_child ("WithSubtitles");
- _colour_lut = f.number_child<int> ("ColourLUT");
_j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
- _dcp_video_frame_rate = f.number_child<int> ("DCPVideoFrameRate");
+ _video_frame_rate = f.number_child<int> ("VideoFrameRate");
_dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate"));
- _dcp_audio_channels = f.number_child<int> ("DCPAudioChannels");
-
+ _encrypted = f.bool_child ("Encrypted");
+ _audio_channels = f.number_child<int> ("AudioChannels");
+ _sequence_video = f.bool_child ("SequenceVideo");
+ _three_d = f.bool_child ("ThreeD");
+ _interop = f.bool_child ("Interop");
+ _key = libdcp::Key (f.string_child ("Key"));
_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"));
_dirty = false;
/** Given a directory name, return its full path within the Film's directory.
* The directory (and its parents) will be created if they do not exist.
*/
-string
-Film::dir (string d) const
+boost::filesystem::path
+Film::dir (boost::filesystem::path d) const
{
- boost::mutex::scoped_lock lm (_directory_mutex);
-
boost::filesystem::path p;
p /= _directory;
p /= d;
boost::filesystem::create_directories (p);
- return p.string ();
+ return p;
}
/** Given a file or directory name, return its full path within the Film's directory.
- * _directory_mutex must not be locked on entry.
* Any required parent directories will be created.
*/
-string
-Film::file (string f) const
+boost::filesystem::path
+Film::file (boost::filesystem::path f) const
{
- boost::mutex::scoped_lock lm (_directory_mutex);
-
boost::filesystem::path p;
p /= _directory;
p /= f;
boost::filesystem::create_directories (p.parent_path ());
- return p.string ();
+ return p;
}
/** @return a DCI-compliant name for a DCP of this film */
if (dcp_content_type()) {
d << "_" << dcp_content_type()->dci_name();
+ d << "-" << dci_metadata().content_version;
+ }
+
+ if (three_d ()) {
+ d << "-3D";
+ }
+
+ if (video_frame_rate() != 24) {
+ d << "-" << video_frame_rate();
}
if (container()) {
if (!dm.audio_language.empty ()) {
d << "_" << dm.audio_language;
- if (!dm.subtitle_language.empty()) {
+ if (!dm.subtitle_language.empty() && with_subtitles()) {
d << "-" << dm.subtitle_language;
} else {
d << "-XX";
}
}
- d << "_51_2K";
+ switch (audio_channels ()) {
+ case 1:
+ d << "_10";
+ break;
+ case 2:
+ d << "_20";
+ break;
+ case 3:
+ d << "_30";
+ break;
+ case 4:
+ d << "_40";
+ break;
+ case 5:
+ d << "_50";
+ break;
+ case 6:
+ d << "_51";
+ break;
+ }
+
+ d << "_" << resolution_to_string (_resolution);
if (!dm.studio.empty ()) {
d << "_" << dm.studio;
void
-Film::set_directory (string d)
+Film::set_directory (boost::filesystem::path d)
{
- boost::mutex::scoped_lock lm (_state_mutex);
_directory = d;
_dirty = true;
}
void
Film::set_name (string n)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _name = n;
- }
+ _name = n;
signal_changed (NAME);
}
void
Film::set_use_dci_name (bool u)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _use_dci_name = u;
- }
+ _use_dci_name = u;
signal_changed (USE_DCI_NAME);
}
void
Film::set_dcp_content_type (DCPContentType const * t)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _dcp_content_type = t;
- }
+ _dcp_content_type = t;
signal_changed (DCP_CONTENT_TYPE);
}
void
Film::set_container (Ratio const * c)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _container = c;
- }
+ _container = c;
signal_changed (CONTAINER);
}
void
-Film::set_scaler (Scaler const * s)
+Film::set_resolution (Resolution r)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _scaler = s;
- }
- signal_changed (SCALER);
+ _resolution = r;
+ signal_changed (RESOLUTION);
}
void
-Film::set_with_subtitles (bool w)
+Film::set_scaler (Scaler const * s)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _with_subtitles = w;
- }
- signal_changed (WITH_SUBTITLES);
+ _scaler = s;
+ signal_changed (SCALER);
}
void
-Film::set_colour_lut (int i)
+Film::set_with_subtitles (bool w)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _colour_lut = i;
- }
- signal_changed (COLOUR_LUT);
+ _with_subtitles = w;
+ signal_changed (WITH_SUBTITLES);
}
void
Film::set_j2k_bandwidth (int b)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _j2k_bandwidth = b;
- }
+ _j2k_bandwidth = b;
signal_changed (J2K_BANDWIDTH);
}
void
Film::set_dci_metadata (DCIMetadata m)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _dci_metadata = m;
- }
+ _dci_metadata = m;
signal_changed (DCI_METADATA);
}
void
-Film::set_dcp_video_frame_rate (int f)
+Film::set_video_frame_rate (int f)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _dcp_video_frame_rate = f;
- }
- signal_changed (DCP_VIDEO_FRAME_RATE);
+ _video_frame_rate = f;
+ signal_changed (VIDEO_FRAME_RATE);
+}
+
+void
+Film::set_audio_channels (int c)
+{
+ _audio_channels = c;
+ signal_changed (AUDIO_CHANNELS);
+}
+
+void
+Film::set_three_d (bool t)
+{
+ _three_d = t;
+ signal_changed (THREE_D);
+}
+
+void
+Film::set_interop (bool i)
+{
+ _interop = i;
+ signal_changed (INTEROP);
}
void
Film::signal_changed (Property p)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _dirty = true;
- }
+ _dirty = true;
switch (p) {
case Film::CONTENT:
- set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ());
+ set_video_frame_rate (_playlist->best_dcp_frame_rate ());
+ break;
+ case Film::VIDEO_FRAME_RATE:
+ case Film::SEQUENCE_VIDEO:
+ _playlist->maybe_sequence_video ();
break;
default:
break;
_dci_date = boost::gregorian::day_clock::local_day ();
}
-string
-Film::info_path (int f) const
+boost::filesystem::path
+Film::info_path (int f, Eyes e) const
{
boost::filesystem::path p;
p /= info_dir ();
stringstream s;
s.width (8);
- s << setfill('0') << f << ".md5";
+ s << setfill('0') << f;
+ if (e == EYES_LEFT) {
+ s << ".L";
+ } else if (e == EYES_RIGHT) {
+ s << ".R";
+ }
+
+ s << ".md5";
+
p /= s.str();
/* info_dir() will already have added any initial bit of the path,
so don't call file() on this.
*/
- return p.string ();
+ return p;
}
-string
-Film::j2c_path (int f, bool t) const
+boost::filesystem::path
+Film::j2c_path (int f, Eyes e, bool t) const
{
boost::filesystem::path p;
p /= "j2c";
- p /= video_state_identifier ();
+ p /= video_identifier ();
stringstream s;
s.width (8);
- s << setfill('0') << f << ".j2c";
+ s << setfill('0') << f;
+
+ if (e == EYES_LEFT) {
+ s << ".L";
+ } else if (e == EYES_RIGHT) {
+ s << ".R";
+ }
+
+ s << ".j2c";
if (t) {
s << ".tmp";
}
p /= s.str();
- return file (p.string ());
+ return file (p);
}
-/** Make an educated guess as to whether we have a complete DCP
- * or not.
- * @return true if we do.
- */
-
-bool
-Film::have_dcp () const
+/** @return List of subdirectories (not full paths) containing DCPs that can be successfully libdcp::DCP::read() */
+list<boost::filesystem::path>
+Film::dcps () const
{
- try {
- libdcp::DCP dcp (dir (dcp_name()));
- dcp.read ();
- } catch (...) {
- return false;
- }
+ list<boost::filesystem::path> out;
+
+ boost::filesystem::path const dir = directory ();
+ for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) {
+ if (
+ boost::filesystem::is_directory (*i) &&
+ i->path().leaf() != "j2c" && i->path().leaf() != "video" && i->path().leaf() != "info" && i->path().leaf() != "analysis"
+ ) {
+
+ try {
+ libdcp::DCP dcp (*i);
+ dcp.read ();
+ out.push_back (i->path().leaf ());
+ } catch (...) {
- return true;
+ }
+ }
+ }
+
+ return out;
}
shared_ptr<Player>
-Film::player () const
+Film::make_player () const
{
return shared_ptr<Player> (new Player (shared_from_this (), _playlist));
}
+void
+Film::set_encrypted (bool e)
+{
+ _encrypted = e;
+ signal_changed (ENCRYPTED);
+}
+
shared_ptr<Playlist>
Film::playlist () const
{
- boost::mutex::scoped_lock lm (_state_mutex);
return _playlist;
}
-Playlist::ContentList
+ContentList
Film::content () const
{
return _playlist->content ();
Film::examine_and_add_content (shared_ptr<Content> c)
{
shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c));
- j->Finished.connect (bind (&Film::add_content_weak, this, boost::weak_ptr<Content> (c)));
+ j->Finished.connect (bind (&Film::maybe_add_content, this, boost::weak_ptr<Job> (j), boost::weak_ptr<Content> (c)));
JobManager::instance()->add (j);
}
void
-Film::add_content_weak (weak_ptr<Content> c)
+Film::maybe_add_content (weak_ptr<Job> j, weak_ptr<Content> c)
{
+ shared_ptr<Job> job = j.lock ();
+ if (!job || !job->finished_ok ()) {
+ return;
+ }
+
shared_ptr<Content> content = c.lock ();
if (content) {
add_content (content);
{
/* Add video content after any existing content */
if (dynamic_pointer_cast<VideoContent> (c)) {
- c->set_start (_playlist->video_end ());
+ c->set_position (_playlist->video_end ());
}
_playlist->add (c);
_playlist->remove (c);
}
+void
+Film::move_content_earlier (shared_ptr<Content> c)
+{
+ _playlist->move_earlier (c);
+}
+
+void
+Film::move_content_later (shared_ptr<Content> c)
+{
+ _playlist->move_later (c);
+}
+
Time
Film::length () const
{
}
OutputVideoFrame
-Film::best_dcp_video_frame_rate () const
+Film::best_video_frame_rate () const
{
return _playlist->best_dcp_frame_rate ();
}
Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
{
if (p == VideoContentProperty::VIDEO_FRAME_RATE) {
- set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ());
+ set_video_frame_rate (_playlist->best_dcp_frame_rate ());
}
if (ui_signaller) {
signal_changed (CONTENT);
}
-int
-Film::loop () const
-{
- return _playlist->loop ();
-}
-
-void
-Film::set_loop (int c)
-{
- _playlist->set_loop (c);
-}
-
OutputAudioFrame
Film::time_to_audio_frames (Time t) const
{
- return t * dcp_audio_frame_rate () / TIME_HZ;
+ return t * audio_frame_rate () / TIME_HZ;
}
OutputVideoFrame
Film::time_to_video_frames (Time t) const
{
- return t * dcp_video_frame_rate () / TIME_HZ;
+ return t * video_frame_rate () / TIME_HZ;
}
Time
Film::audio_frames_to_time (OutputAudioFrame f) const
{
- return f * TIME_HZ / dcp_audio_frame_rate ();
+ return f * TIME_HZ / audio_frame_rate ();
}
Time
Film::video_frames_to_time (OutputVideoFrame f) const
{
- return f * TIME_HZ / dcp_video_frame_rate ();
+ return f * TIME_HZ / video_frame_rate ();
}
OutputAudioFrame
-Film::dcp_audio_frame_rate () const
+Film::audio_frame_rate () const
{
/* XXX */
return 48000;
void
Film::set_sequence_video (bool s)
{
+ _sequence_video = s;
_playlist->set_sequence_video (s);
+ signal_changed (SEQUENCE_VIDEO);
}
libdcp::Size
Film::full_frame () const
{
- return libdcp::Size (2048, 1080);
+ switch (_resolution) {
+ case RESOLUTION_2K:
+ return libdcp::Size (2048, 1080);
+ case RESOLUTION_4K:
+ return libdcp::Size (4096, 2160);
+ }
+
+ assert (false);
+ return libdcp::Size ();
+}
+
+libdcp::KDM
+Film::make_kdm (
+ shared_ptr<libdcp::Certificate> target,
+ boost::filesystem::path dcp_dir,
+ boost::posix_time::ptime from,
+ boost::posix_time::ptime until
+ ) const
+{
+ shared_ptr<const Signer> signer = make_signer ();
+
+ libdcp::DCP dcp (dir (dcp_dir.string ()));
+
+ try {
+ dcp.read ();
+ } catch (...) {
+ throw KDMError (_("Could not read DCP to make KDM for"));
+ }
+
+ time_t now = time (0);
+ struct tm* tm = localtime (&now);
+ string const issue_date = libdcp::tm_to_string (tm);
+
+ dcp.cpls().front()->set_mxf_keys (key ());
+
+ return libdcp::KDM (dcp.cpls().front(), signer, target, from, until, "DCP-o-matic", issue_date);
+}
+
+list<libdcp::KDM>
+Film::make_kdms (
+ list<shared_ptr<Screen> > screens,
+ boost::filesystem::path dcp,
+ boost::posix_time::ptime from,
+ boost::posix_time::ptime until
+ ) const
+{
+ list<libdcp::KDM> kdms;
+
+ for (list<shared_ptr<Screen> >::iterator i = screens.begin(); i != screens.end(); ++i) {
+ kdms.push_back (make_kdm ((*i)->certificate, dcp, from, until));
+ }
+
+ return kdms;
}
projects / dcpomatic.git / blobdiff