/*
- Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include <libxml++/libxml++.h>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
#include <boost/regex.hpp>
#include <unistd.h>
#include <stdexcept>
using std::map;
using std::exception;
using std::find;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::make_shared;
+using std::dynamic_pointer_cast;
using boost::optional;
using boost::is_any_of;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::raw_convert;
using namespace dcpomatic;
, _audio_language (dcp::LanguageTag("en-US"))
, _release_territory (dcp::LanguageTag::RegionSubtag("US"))
, _version_number (1)
- , _status (dcp::FINAL)
- , _luminance (dcp::Luminance(4.5, dcp::Luminance::FOOT_LAMBERT))
+ , _status (dcp::Status::FINAL)
+ , _luminance (dcp::Luminance(4.5, dcp::Luminance::Unit::FOOT_LAMBERT))
, _state_version (current_state_version)
, _dirty (false)
, _tolerant (false)
boost::filesystem::path p (boost::filesystem::system_complete (dir.get()));
boost::filesystem::path result;
- for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) {
- if (*i == "..") {
+ for (auto i: p) {
+ if (i == "..") {
boost::system::error_code ec;
if (boost::filesystem::is_symlink(result, ec) || result.filename() == "..") {
- result /= *i;
+ result /= i;
} else {
result = result.parent_path ();
}
- } else if (*i != ".") {
- result /= *i;
+ } else if (i != ".") {
+ result /= i;
}
}
}
if (_directory) {
- _log.reset (new FileLog (file ("log")));
+ _log = make_shared<FileLog>(file("log"));
} else {
- _log.reset (new NullLog);
+ _log = make_shared<NullLog>();
}
_playlist->set_sequence (_sequence);
Film::~Film ()
{
- BOOST_FOREACH (boost::signals2::connection& i, _job_connections) {
+ for (auto& i: _job_connections) {
i.disconnect ();
}
- BOOST_FOREACH (boost::signals2::connection& i, _audio_analysis_connections) {
+ for (auto& i: _audio_analysis_connections) {
i.disconnect ();
}
}
boost::filesystem::path
Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
{
- boost::filesystem::path p = dir ("analysis");
+ auto p = dir ("analysis");
Digester digester;
- BOOST_FOREACH (shared_ptr<Content> i, playlist->content ()) {
+ for (auto i: playlist->content ()) {
if (!i->audio) {
continue;
}
boost::filesystem::path
Film::subtitle_analysis_path (shared_ptr<const Content> content) const
{
- boost::filesystem::path p = dir ("analysis");
+ auto p = dir ("analysis");
Digester digester;
digester.add (content->digest());
if (!content->text.empty()) {
- shared_ptr<TextContent> tc = content->text.front();
+ auto tc = content->text.front();
digester.add (tc->x_scale());
digester.add (tc->y_scale());
- BOOST_FOREACH (shared_ptr<dcpomatic::Font> i, tc->fonts()) {
+ for (auto i: tc->fonts()) {
digester.add (i->id());
}
if (tc->effect()) {
digester.add (tc->outline_width());
}
- shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent>(content);
+ auto fc = dynamic_pointer_cast<const FFmpegContent>(content);
if (fc) {
digester.add (fc->subtitle_stream()->identifier());
}
throw BadSettingError (_("name"), _("Cannot contain slashes"));
}
- if (container() == 0) {
+ if (container() == nullptr) {
throw MissingSettingError (_("container"));
}
throw runtime_error (_("The DCP is empty, perhaps because all the content has zero length."));
}
- if (dcp_content_type() == 0) {
+ if (dcp_content_type() == nullptr) {
throw MissingSettingError (_("content type"));
}
set_name ("DCP");
}
- BOOST_FOREACH (shared_ptr<const Content> i, content ()) {
+ for (auto i: content ()) {
if (!i->paths_valid()) {
throw runtime_error (_("some of your content is missing"));
}
- shared_ptr<const DCPContent> dcp = dynamic_pointer_cast<const DCPContent> (i);
+ auto dcp = dynamic_pointer_cast<const DCPContent>(i);
if (dcp && dcp->needs_kdm()) {
throw runtime_error (_("Some of your content needs a KDM"));
}
set_isdcf_date_today ();
- BOOST_FOREACH (string i, environment_info ()) {
+ for (auto i: environment_info ()) {
LOG_GENERAL_NC (i);
}
- BOOST_FOREACH (shared_ptr<const Content> i, content ()) {
+ for (auto i: content ()) {
LOG_GENERAL ("Content: %1", i->technical_summary());
}
LOG_GENERAL ("DCP video rate %1 fps", video_frame_rate());
}
LOG_GENERAL ("J2K bandwidth %1", j2k_bandwidth());
- shared_ptr<TranscodeJob> tj (new TranscodeJob (shared_from_this()));
- tj->set_encoder (shared_ptr<Encoder> (new DCPEncoder (shared_from_this(), tj)));
+ auto tj = make_shared<TranscodeJob>(shared_from_this());
+ tj->set_encoder (make_shared<DCPEncoder>(shared_from_this(), tj));
if (check) {
- shared_ptr<CheckContentChangeJob> cc (new CheckContentChangeJob(shared_from_this(), tj, gui));
+ auto cc = make_shared<CheckContentChangeJob>(shared_from_this(), tj, gui);
JobManager::instance()->add (cc);
} else {
JobManager::instance()->add (tj);
void
Film::send_dcp_to_tms ()
{
- shared_ptr<Job> j (new UploadJob (shared_from_this()));
- JobManager::instance()->add (j);
+ JobManager::instance()->add(make_shared<UploadJob>(shared_from_this()));
}
shared_ptr<xmlpp::Document>
Film::metadata (bool with_content_paths) const
{
- shared_ptr<xmlpp::Document> doc (new xmlpp::Document);
- xmlpp::Element* root = doc->create_root_node ("Metadata");
+ auto doc = make_shared<xmlpp::Document>();
+ auto root = doc->create_root_node ("Metadata");
root->add_child("Version")->add_child_text (raw_convert<string> (current_state_version));
root->add_child("Name")->add_child_text (_name);
root->add_child("ReencodeJ2K")->add_child_text (_reencode_j2k ? "1" : "0");
root->add_child("UserExplicitVideoFrameRate")->add_child_text(_user_explicit_video_frame_rate ? "1" : "0");
for (map<dcp::Marker, DCPTime>::const_iterator i = _markers.begin(); i != _markers.end(); ++i) {
- xmlpp::Element* m = root->add_child("Marker");
+ auto m = root->add_child("Marker");
m->set_attribute("Type", dcp::marker_to_string(i->first));
m->add_child_text(raw_convert<string>(i->second.get()));
}
- BOOST_FOREACH (dcp::Rating i, _ratings) {
+ for (auto i: _ratings) {
i.as_xml (root->add_child("Rating"));
}
- BOOST_FOREACH (string i, _content_versions) {
+ for (auto i: _content_versions) {
root->add_child("ContentVersion")->add_child_text(i);
}
root->add_child("NameLanguage")->add_child_text(_name_language.to_string());
root->add_child("LuminanceUnit")->add_child_text(dcp::Luminance::unit_to_string(_luminance.unit()));
root->add_child("UserExplicitContainer")->add_child_text(_user_explicit_container ? "1" : "0");
root->add_child("UserExplicitResolution")->add_child_text(_user_explicit_resolution ? "1" : "0");
+ for (auto i: _subtitle_languages) {
+ root->add_child("SubtitleLanguage")->add_child_text(i.to_string());
+ }
_playlist->as_xml (root->add_child ("Playlist"), with_content_paths);
return doc;
void
Film::write_metadata (boost::filesystem::path path) const
{
- shared_ptr<xmlpp::Document> doc = metadata ();
- doc->write_to_file_formatted (path.string());
+ metadata()->write_to_file_formatted(path.string());
}
/** Write state to our `metadata' file */
{
DCPOMATIC_ASSERT (directory());
boost::filesystem::create_directories (directory().get());
- shared_ptr<xmlpp::Document> doc = metadata ();
- doc->write_to_file_formatted (file(metadata_file).string ());
+ metadata()->write_to_file_formatted(file(metadata_file).string());
_dirty = false;
}
{
boost::filesystem::create_directories (path.parent_path());
shared_ptr<xmlpp::Document> doc = metadata (false);
- doc->write_to_file_formatted (path.string ());
+ metadata(false)->write_to_file_formatted(path.string());
}
/** Read state from our metadata file.
throw runtime_error (_("This film was created with a newer version of DCP-o-matic, and it cannot be loaded into this version. Sorry!"));
} else if (_state_version < current_state_version) {
/* This is an older version; save a copy (if we haven't already) */
- boost::filesystem::path const older = path->parent_path() / String::compose("metadata.%1.xml", _state_version);
+ auto const older = path->parent_path() / String::compose("metadata.%1.xml", _state_version);
if (!boost::filesystem::is_regular_file(older)) {
try {
boost::filesystem::copy_file(*path, older);
{
- optional<string> c = f.optional_string_child ("DCPContentType");
+ auto c = f.optional_string_child("DCPContentType");
if (c) {
_dcp_content_type = DCPContentType::from_isdcf_name (c.get ());
}
}
{
- optional<string> c = f.optional_string_child ("Container");
+ auto c = f.optional_string_child("Container");
if (c) {
_container = Ratio::from_id (c.get ());
}
}
if (_audio_processor && !Config::instance()->show_experimental_audio_processors()) {
- list<AudioProcessor const *> ap = AudioProcessor::visible();
+ auto ap = AudioProcessor::visible();
if (find(ap.begin(), ap.end(), _audio_processor) == ap.end()) {
Config::instance()->set_show_experimental_audio_processors(true);
}
_reencode_j2k = f.optional_bool_child("ReencodeJ2K").get_value_or(false);
_user_explicit_video_frame_rate = f.optional_bool_child("UserExplicitVideoFrameRate").get_value_or(false);
- BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("Marker")) {
+ for (auto i: f.node_children("Marker")) {
_markers[dcp::marker_from_string(i->string_attribute("Type"))] = DCPTime(dcp::raw_convert<DCPTime::Type>(i->content()));
}
- BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("Rating")) {
+ for (auto i: f.node_children("Rating")) {
_ratings.push_back (dcp::Rating(i));
}
- BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("ContentVersion")) {
+ for (auto i: f.node_children("ContentVersion")) {
_content_versions.push_back (i->content());
}
- optional<string> name_language = f.optional_string_child("NameLanguage");
+ auto name_language = f.optional_string_child("NameLanguage");
if (name_language) {
_name_language = dcp::LanguageTag (*name_language);
}
- optional<string> audio_language = f.optional_string_child("AudioLanguage");
+ auto audio_language = f.optional_string_child("AudioLanguage");
if (audio_language) {
_audio_language = dcp::LanguageTag (*audio_language);
}
- optional<string> release_territory = f.optional_string_child("ReleaseTerritory");
+ auto release_territory = f.optional_string_child("ReleaseTerritory");
if (release_territory) {
_release_territory = dcp::LanguageTag::RegionSubtag (*release_territory);
}
_version_number = f.optional_number_child<int>("VersionNumber").get_value_or(0);
- optional<string> status = f.optional_string_child("Status");
+ auto status = f.optional_string_child("Status");
if (status) {
_status = dcp::string_to_status (*status);
}
_distributor = f.optional_string_child("Distributor").get_value_or("");
_facility = f.optional_string_child("Facility").get_value_or("");
- float value = f.optional_number_child<float>("LuminanceValue").get_value_or(4.5);
- optional<string> unit = f.optional_string_child("LuminanceUnit");
+ auto value = f.optional_number_child<float>("LuminanceValue").get_value_or(4.5);
+ auto unit = f.optional_string_child("LuminanceUnit");
if (unit) {
_luminance = dcp::Luminance (value, dcp::Luminance::string_to_unit(*unit));
}
_user_explicit_container = f.optional_bool_child("UserExplicitContainer").get_value_or(true);
_user_explicit_resolution = f.optional_bool_child("UserExplicitResolution").get_value_or(true);
+ for (auto i: f.node_children("SubtitleLanguage")) {
+ _subtitle_languages.push_back (dcp::LanguageTag(i->content()));
+ }
+
list<string> notes;
_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes);
set_backtrace_file (file ("backtrace.txt"));
}
+ /* Around 2.15.108 we removed subtitle language state from the text content and the ISDCF
+ * metadata and put it into the Film instead. If we've loaded an old Film let's try and fish
+ * out the settings from where they were so that they don't get lost.
+ */
+
+ optional<dcp::LanguageTag> found_language;
+
+ for (auto i: f.node_child("Playlist")->node_children("Content")) {
+ auto text = i->optional_node_child("Text");
+ if (text && text->optional_string_child("Language") && !found_language) {
+ try {
+ found_language = dcp::LanguageTag(text->string_child("Language"));
+ } catch (...) {}
+ }
+ }
+
+ if (_state_version >= 9) {
+ auto isdcf_language = f.node_child("ISDCFMetadata")->optional_string_child("SubtitleLanguage");
+ if (isdcf_language && !found_language) {
+ try {
+ found_language = dcp::LanguageTag(*isdcf_language);
+ } catch (...) {
+ try {
+ found_language = dcp::LanguageTag(boost::algorithm::to_lower_copy(*isdcf_language));
+ } catch (...) {
+
+ }
+ }
+ }
+ }
+
+ if (found_language) {
+ _subtitle_languages.push_back (*found_language);
+ }
+
_dirty = false;
return notes;
}
mapped.push_back (i);
}
} else {
- BOOST_FOREACH (shared_ptr<Content> i, content ()) {
+ for (auto i: content()) {
if (i->audio) {
- list<int> c = i->audio->mapping().mapped_output_channels ();
- copy (c.begin(), c.end(), back_inserter (mapped));
+ auto c = i->audio->mapping().mapped_output_channels();
+ copy (c.begin(), c.end(), back_inserter(mapped));
}
}
{
string d;
- string raw_name = name ();
+ auto raw_name = name ();
/* Split the raw name up into words */
vector<string> words;
string fixed_name;
/* Add each word to fixed_name */
- for (vector<string>::const_iterator i = words.begin(); i != words.end(); ++i) {
- string w = *i;
+ for (auto i: words) {
+ string w = i;
/* First letter is always capitalised */
w[0] = toupper (w[0]);
/* Count caps in w */
size_t caps = 0;
- for (size_t i = 0; i < w.size(); ++i) {
- if (isupper (w[i])) {
+ for (size_t j = 0; j < w.size(); ++j) {
+ if (isupper (w[j])) {
++caps;
}
}
leave it alone.
*/
if (caps == w.size ()) {
- for (size_t i = 1; i < w.size(); ++i) {
- w[i] = tolower (w[i]);
+ for (size_t j = 1; j < w.size(); ++j) {
+ w[j] = tolower (w[j]);
}
}
- for (size_t i = 0; i < w.size(); ++i) {
- fixed_name += w[i];
+ for (size_t j = 0; j < w.size(); ++j) {
+ fixed_name += w[j];
}
}
d += "-" + raw_convert<string>(isdcf_metadata().content_version);
}
- ISDCFMetadata const dm = isdcf_metadata ();
+ auto const dm = isdcf_metadata ();
if (dm.temp_version) {
d += "-Temp";
/* XXX: this uses the first bit of content only */
/* Interior aspect ratio. The standard says we don't do this for trailers, for some strange reason */
- if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::TRAILER) {
- Ratio const * content_ratio = 0;
- BOOST_FOREACH (shared_ptr<Content> i, content ()) {
+ if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::ContentKind::TRAILER) {
+ Ratio const* content_ratio = nullptr;
+ for (auto i: content ()) {
if (i->video) {
/* Here's the first piece of video content */
content_ratio = Ratio::nearest_from_ratio(i->video->scaled_size(frame_size()).ratio());
for now I'm just appending -CCAP if we have any closed captions.
*/
- optional<string> subtitle_language;
- bool burnt_in = true;
- bool ccap = false;
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
- BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
- if (j->type() == TEXT_OPEN_SUBTITLE && j->use()) {
- subtitle_language = j->language ();
- if (!j->burn()) {
- burnt_in = false;
- }
+ auto burnt_in = true;
+ auto ccap = false;
+ for (auto i: content()) {
+ for (auto j: i->text) {
+ if (j->type() == TEXT_OPEN_SUBTITLE && j->use() && !j->burn()) {
+ burnt_in = false;
} else if (j->type() == TEXT_CLOSED_CAPTION && j->use()) {
ccap = true;
}
}
}
- if (dm.subtitle_language) {
- /* Subtitle language is overridden in ISDCF metadata, primarily to handle
- content with pre-burnt subtitles.
- */
- d += "-" + *dm.subtitle_language;
- if (ccap) {
- d += "-CCAP";
- }
- } else if (subtitle_language) {
- /* Language is worked out from the content */
- if (burnt_in && *subtitle_language != "XX") {
- transform (subtitle_language->begin(), subtitle_language->end(), subtitle_language->begin(), ::tolower);
+ if (!_subtitle_languages.empty()) {
+ auto lang = _subtitle_languages.front().language().get_value_or("en").subtag();
+ if (burnt_in) {
+ transform (lang.begin(), lang.end(), lang.begin(), ::tolower);
} else {
- transform (subtitle_language->begin(), subtitle_language->end(), subtitle_language->begin(), ::toupper);
+ transform (lang.begin(), lang.end(), lang.begin(), ::toupper);
}
- d += "-" + *subtitle_language;
+ d += "-" + lang;
if (ccap) {
d += "-CCAP";
}
/* Count mapped audio channels */
- list<int> mapped = mapped_audio_channels ();
+ auto mapped = mapped_audio_channels ();
- pair<int, int> ch = audio_channel_types (mapped, audio_channels());
+ auto ch = audio_channel_types (mapped, audio_channels());
if (!ch.first && !ch.second) {
d += "_MOS";
} else if (ch.first) {
d += String::compose("_%1%2", ch.first, ch.second);
}
- if (audio_channels() > static_cast<int>(dcp::HI) && find(mapped.begin(), mapped.end(), dcp::HI) != mapped.end()) {
+ if (audio_channels() > static_cast<int>(dcp::Channel::HI) && find(mapped.begin(), mapped.end(), static_cast<int>(dcp::Channel::HI)) != mapped.end()) {
d += "-HI";
}
- if (audio_channels() > static_cast<int>(dcp::VI) && find(mapped.begin(), mapped.end(), dcp::VI) != mapped.end()) {
+ if (audio_channels() > static_cast<int>(dcp::Channel::VI) && find(mapped.begin(), mapped.end(), static_cast<int>(dcp::Channel::VI)) != mapped.end()) {
d += "-VI";
}
d += "-3D";
}
- bool vf = false;
- BOOST_FOREACH (shared_ptr<Content> i, content ()) {
- shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (i);
+ auto vf = false;
+ for (auto i: content()) {
+ auto dc = dynamic_pointer_cast<const DCPContent>(i);
if (!dc) {
continue;
}
vector<CPLSummary> out;
- boost::filesystem::path const dir = directory().get();
- for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) {
+ auto const dir = directory().get();
+ for (auto i: boost::filesystem::directory_iterator(dir)) {
if (
- boost::filesystem::is_directory (*i) &&
- i->path().leaf() != "j2c" && i->path().leaf() != "video" && i->path().leaf() != "info" && i->path().leaf() != "analysis"
+ boost::filesystem::is_directory (i) &&
+ i.path().leaf() != "j2c" && i.path().leaf() != "video" && i.path().leaf() != "info" && i.path().leaf() != "analysis"
) {
try {
- out.push_back (CPLSummary(*i));
+ out.push_back (CPLSummary(i));
} catch (...) {
}
run_ffprobe (content->path(0), file("ffprobe.log"));
}
- shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), content));
+ auto j = make_shared<ExamineContentJob>(shared_from_this(), content);
_job_connections.push_back (
j->Finished.connect (bind (&Film::maybe_add_content, this, weak_ptr<Job>(j), weak_ptr<Content>(content), disable_audio_analysis))
void
Film::maybe_add_content (weak_ptr<Job> j, weak_ptr<Content> c, bool disable_audio_analysis)
{
- shared_ptr<Job> job = j.lock ();
+ auto job = j.lock ();
if (!job || !job->finished_ok ()) {
return;
}
- shared_ptr<Content> content = c.lock ();
+ auto content = c.lock ();
if (!content) {
return;
}
add_content (content);
if (Config::instance()->automatic_audio_analysis() && content->audio && !disable_audio_analysis) {
- shared_ptr<Playlist> playlist (new Playlist);
+ auto playlist = make_shared<Playlist>();
playlist->add (shared_from_this(), content);
boost::signals2::connection c;
JobManager::instance()->analyse_audio (
if (_template_film) {
/* Take settings from the first piece of content of c's type in _template */
- BOOST_FOREACH (shared_ptr<Content> i, _template_film->content()) {
+ for (auto i: _template_film->content()) {
c->take_settings_from (i);
}
}
{
/* Get the only piece of video content, if there is only one */
shared_ptr<VideoContent> video;
- BOOST_FOREACH (shared_ptr<const Content> i, _playlist->content()) {
+ for (auto i: _playlist->content()) {
if (i->video) {
if (!video) {
video = i->video;
Film::best_video_frame_rate () const
{
/* Don't default to anything above 30fps (make the user select that explicitly) */
- int best = _playlist->best_video_frame_rate ();
+ auto best = _playlist->best_video_frame_rate ();
if (best > 30) {
best /= 2;
}
Film::check_settings_consistency ()
{
optional<int> atmos_rate;
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
+ for (auto i: content()) {
if (i->atmos) {
int rate = lrintf (i->atmos->edit_rate().as_float());
}
bool change_made = false;
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
- shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+ for (auto i: content()) {
+ auto d = dynamic_pointer_cast<DCPContent>(i);
if (!d) {
continue;
}
d->set_reference_audio(false);
change_made = true;
}
+ if (d->reference_text(TEXT_OPEN_SUBTITLE) && !d->can_reference_text(shared_from_this(), TEXT_OPEN_SUBTITLE, why_not)) {
+ d->set_reference_text(TEXT_OPEN_SUBTITLE, false);
+ change_made = true;
+ }
+ if (d->reference_text(TEXT_CLOSED_CAPTION) && !d->can_reference_text(shared_from_this(), TEXT_CLOSED_CAPTION, why_not)) {
+ d->set_reference_text(TEXT_CLOSED_CAPTION, false);
+ change_made = true;
+ }
}
if (change_made) {
dcp::Size
Film::active_area () const
{
- dcp::Size const frame = frame_size ();
+ auto const frame = frame_size ();
dcp::Size active;
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
+ for (auto i: content()) {
if (i->video) {
dcp::Size s = i->video->scaled_size (frame);
active.width = max(active.width, s.width);
throw runtime_error (_("Cannot make a KDM as this project is not encrypted."));
}
- shared_ptr<const dcp::CPL> cpl (new dcp::CPL (cpl_file));
- shared_ptr<const dcp::CertificateChain> signer = Config::instance()->signer_chain ();
+ auto cpl = make_shared<dcp::CPL>(cpl_file);
+ auto signer = Config::instance()->signer_chain();
if (!signer->valid ()) {
throw InvalidSignerError ();
}
/* Find keys that have been added to imported, encrypted DCP content */
list<dcp::DecryptedKDMKey> imported_keys;
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
- shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent> (i);
+ for (auto i: content()) {
+ auto d = dynamic_pointer_cast<DCPContent> (i);
if (d && d->kdm()) {
dcp::DecryptedKDM kdm (d->kdm().get(), Config::instance()->decryption_chain()->key().get());
- list<dcp::DecryptedKDMKey> keys = kdm.keys ();
+ auto keys = kdm.keys ();
copy (keys.begin(), keys.end(), back_inserter (imported_keys));
}
}
map<shared_ptr<const dcp::ReelMXF>, dcp::Key> keys;
- BOOST_FOREACH(shared_ptr<const dcp::ReelMXF> i, cpl->reel_mxfs()) {
+ for (auto i: cpl->reel_mxfs()) {
if (!i->key_id()) {
continue;
}
/* Get any imported key for this ID */
bool done = false;
- BOOST_FOREACH (dcp::DecryptedKDMKey j, imported_keys) {
+ for (auto j: imported_keys) {
if (j.id() == i->key_id().get()) {
LOG_GENERAL ("Using imported key for %1", i->key_id().get());
keys[i] = j.key();
boost::filesystem::path test = internal_video_asset_dir() / "test";
boost::filesystem::path test2 = internal_video_asset_dir() / "test2";
can_hard_link = true;
- FILE* f = fopen_boost (test, "w");
+ auto f = fopen_boost (test, "w");
if (f) {
fclose (f);
boost::system::error_code ec;
boost::filesystem::remove (test2);
}
- boost::filesystem::space_info s = boost::filesystem::space (internal_video_asset_dir ());
+ auto s = boost::filesystem::space (internal_video_asset_dir ());
required = double (required_disk_space ()) / 1073741824.0f;
if (!can_hard_link) {
required *= 2;
return (available - required) > 1;
}
-string
-Film::subtitle_language () const
-{
- set<string> languages;
-
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
- BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
- languages.insert (j->language ());
- }
- }
-
- string all;
- BOOST_FOREACH (string s, languages) {
- if (!all.empty ()) {
- all += "/" + s;
- } else {
- all += s;
- }
- }
-
- return all;
-}
-
/** @return The names of the channels that audio contents' outputs are passed into;
* this is either the DCP or a AudioProcessor.
*/
-vector<string>
+vector<NamedChannel>
Film::audio_output_names () const
{
if (audio_processor ()) {
DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16);
- vector<string> n;
+ vector<NamedChannel> n;
for (int i = 0; i < audio_channels(); ++i) {
- n.push_back (short_audio_channel_name (i));
+ if (i != 8 && i != 9 && i != 15) {
+ n.push_back (NamedChannel(short_audio_channel_name(i), i));
+ }
}
return n;
Film::reels () const
{
list<DCPTimePeriod> p;
- DCPTime const len = length();
+ auto const len = length();
switch (reel_type ()) {
case REELTYPE_SINGLE:
list<DCPTime> split_points;
split_points.push_back (DCPTime());
split_points.push_back (len);
- BOOST_FOREACH (shared_ptr<Content> c, content()) {
+ for (auto c: content()) {
if (c->video) {
- BOOST_FOREACH (DCPTime t, c->reel_split_points(shared_from_this())) {
+ for (auto t: c->reel_split_points(shared_from_this())) {
split_points.push_back (t);
}
split_points.push_back (c->end(shared_from_this()));
/* Make them into periods, coalescing any that are less than 1 second long */
optional<DCPTime> last;
- BOOST_FOREACH (DCPTime t, split_points) {
+ for (auto t: split_points) {
if (last && (t - *last) >= DCPTime::from_seconds(1)) {
/* Period from *last to t is long enough; use it and start a new one */
p.push_back (DCPTimePeriod(*last, t));
bool
Film::references_dcp_video () const
{
- BOOST_FOREACH (shared_ptr<Content> i, _playlist->content()) {
- shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+ for (auto i: _playlist->content()) {
+ auto d = dynamic_pointer_cast<DCPContent>(i);
if (d && d->reference_video()) {
return true;
}
bool
Film::references_dcp_audio () const
{
- BOOST_FOREACH (shared_ptr<Content> i, _playlist->content()) {
- shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+ for (auto i: _playlist->content()) {
+ auto d = dynamic_pointer_cast<DCPContent>(i);
if (d && d->reference_audio()) {
return true;
}
bool
Film::contains_atmos_content () const
{
- BOOST_FOREACH (shared_ptr<Content> i, _playlist->content()) {
+ for (auto i: _playlist->content()) {
if (i->atmos) {
return true;
}
Film::closed_caption_tracks () const
{
list<DCPTextTrack> tt;
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
- BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+ for (auto i: content()) {
+ for (auto j: i->text) {
/* XXX: Empty DCPTextTrack ends up being a magic value here - the "unknown" or "not specified" track */
- DCPTextTrack dtt = j->dcp_track().get_value_or(DCPTextTrack());
+ auto dtt = j->dcp_track().get_value_or(DCPTextTrack());
if (j->type() == TEXT_CLOSED_CAPTION && find(tt.begin(), tt.end(), dtt) == tt.end()) {
tt.push_back (dtt);
}
}
+void
+Film::set_subtitle_language (dcp::LanguageTag language)
+{
+ set_subtitle_languages ({language});
+}
+
+
+void
+Film::unset_subtitle_language ()
+{
+ ChangeSignaller<Film> ch (this, SUBTITLE_LANGUAGES);
+ _subtitle_languages.clear();
+}
+
+
+void
+Film::set_subtitle_languages (vector<dcp::LanguageTag> languages)
+{
+ ChangeSignaller<Film> ch (this, SUBTITLE_LANGUAGES);
+ _subtitle_languages = languages;
+}
+
+
void
Film::set_facility (string f)
{
optional<DCPTime>
Film::marker (dcp::Marker type) const
{
- map<dcp::Marker, DCPTime>::const_iterator i = _markers.find (type);
+ auto i = _markers.find (type);
if (i == _markers.end()) {
- return optional<DCPTime>();
+ return {};
}
return i->second;
}
shared_ptr<InfoFileHandle>
Film::info_file_handle (DCPTimePeriod period, bool read) const
{
- return shared_ptr<InfoFileHandle> (new InfoFileHandle(_info_file_mutex, info_file(period), read));
+ return std::make_shared<InfoFileHandle>(_info_file_mutex, info_file(period), read);
}
InfoFileHandle::InfoFileHandle (boost::mutex& mutex, boost::filesystem::path file, bool read)
throw OpenFileError (file, errno, OpenFileError::READ);
}
} else {
- bool const exists = boost::filesystem::exists (file);
+ auto const exists = boost::filesystem::exists (file);
if (exists) {
_handle = fopen_boost (file, "r+b");
} else {
{
fclose (_handle);
}
+
+
+/** Add FFOC and LFOC markers to a list if they are not already there */
+void
+Film::add_ffoc_lfoc (Markers& markers) const
+{
+ if (markers.find(dcp::Marker::FFOC) == markers.end()) {
+ markers[dcp::Marker::FFOC] = dcpomatic::DCPTime::from_frames(1, video_frame_rate());
+ }
+
+ if (markers.find(dcp::Marker::LFOC) == markers.end()) {
+ markers[dcp::Marker::LFOC] = length() - DCPTime::from_frames(1, video_frame_rate());
+ }
+}