/*
- Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
using std::vector;
using std::max;
using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
using dcp::raw_convert;
using dcp::locale_convert;
+using namespace dcpomatic;
int const ContentProperty::PATH = 400;
int const ContentProperty::POSITION = 401;
Content::Content (cxml::ConstNodePtr node)
: _change_signals_frequent (false)
{
- list<cxml::NodePtr> path_children = node->node_children ("Path");
- BOOST_FOREACH (cxml::NodePtr i, path_children) {
+ for (auto i: node->node_children("Path")) {
_paths.push_back (i->content());
- optional<time_t> const mod = i->optional_number_attribute<time_t>("mtime");
+ auto const mod = i->optional_number_attribute<time_t>("mtime");
if (mod) {
_last_write_times.push_back (*mod);
} else if (boost::filesystem::exists(i->content())) {
Content::calculate_digest () const
{
boost::mutex::scoped_lock lm (_mutex);
- vector<boost::filesystem::path> p = _paths;
+ auto p = _paths;
lm.unlock ();
/* Some content files are very big, so we use a poor man's
job->sub (_("Computing digest"));
}
- string const d = calculate_digest ();
+ auto const d = calculate_digest ();
boost::mutex::scoped_lock lm (_mutex);
_digest = d;
_last_write_times.clear ();
- BOOST_FOREACH (boost::filesystem::path i, _paths) {
+ for (auto i: _paths) {
_last_write_times.push_back (boost::filesystem::last_write_time(i));
}
}
Content::signal_change (ChangeType c, int p)
{
try {
- if (c == CHANGE_TYPE_PENDING || c == CHANGE_TYPE_CANCELLED) {
+ if (c == ChangeType::PENDING || c == ChangeType::CANCELLED) {
Change (c, shared_from_this(), p, _change_signals_frequent);
} else {
emit (boost::bind (boost::ref(Change), c, shared_from_this(), p, _change_signals_frequent));
}
- } catch (boost::bad_weak_ptr &) {
+ } catch (std::bad_weak_ptr &) {
/* This must be during construction; never mind */
}
}
void
-Content::set_position (shared_ptr<const Film> film, DCPTime p)
+Content::set_position (shared_ptr<const Film> film, DCPTime p, bool force_emit)
{
/* video and audio content can modify its position */
video->modify_position (film, p);
}
- if (audio) {
+ /* Only allow the audio to modify if we have no video;
+ sometimes p can't be on an integer video AND audio frame,
+ and in these cases we want the video constraint to be
+ satisfied since (I think) the audio code is better able to
+ cope.
+ */
+ if (!video && audio) {
audio->modify_position (film, p);
}
{
boost::mutex::scoped_lock lm (_mutex);
- if (p == _position) {
+ if (p == _position && !force_emit) {
cc.abort ();
return;
}
video->modify_trim_start (t);
}
- if (audio) {
+ /* See note in ::set_position */
+ if (!video && audio) {
audio->modify_trim_start (t);
}
{
/* This is a bit naughty, but I can't think of a compelling reason not to do it ... */
xmlpp::Document doc;
- xmlpp::Node* node = doc.create_root_node ("Content");
+ auto node = doc.create_root_node ("Content");
as_xml (node, true);
/* notes is unused here (we assume) */
string
Content::technical_summary () const
{
- string s = String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
+ auto s = String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
if (_video_frame_rate) {
s += String::compose(" %1", *_video_frame_rate);
}
DCPTime
Content::length_after_trim (shared_ptr<const Film> film) const
{
- return max (DCPTime(), full_length(film) - DCPTime(trim_start() + trim_end(), film->active_frame_rate_change(position())));
+ auto length = max(DCPTime(), full_length(film) - DCPTime(trim_start() + trim_end(), film->active_frame_rate_change(position())));
+ if (video) {
+ length = length.round(film->video_frame_rate());
+ }
+ return length;
}
/** @return string which changes when something about this content changes which affects
bool
Content::paths_valid () const
{
- BOOST_FOREACH (boost::filesystem::path i, _paths) {
+ for (auto i: _paths) {
if (!boost::filesystem::exists (i)) {
return false;
}
boost::mutex::scoped_lock lm (_mutex);
_paths = paths;
_last_write_times.clear ();
- BOOST_FOREACH (boost::filesystem::path i, _paths) {
+ for (auto i: _paths) {
_last_write_times.push_back (boost::filesystem::last_write_time(i));
}
}
DCPOMATIC_ASSERT (number_of_paths ());
- string s = path(0).filename().string ();
+ auto s = path(0).filename().string();
if (number_of_paths() > 1) {
s += " ...";
}
audio->take_settings_from (c->audio);
}
- list<shared_ptr<TextContent> >::iterator i = text.begin ();
- list<shared_ptr<TextContent> >::const_iterator j = c->text.begin ();
+ auto i = text.begin ();
+ auto j = c->text.begin ();
while (i != text.end() && j != c->text.end()) {
(*i)->take_settings_from (*j);
++i;
shared_ptr<TextContent>
Content::text_of_original_type (TextType type) const
{
- BOOST_FOREACH (shared_ptr<TextContent> i, text) {
+ for (auto i: text) {
if (i->original_type() == type) {
return i;
}