*/
#include "content.h"
+#include "change_signaller.h"
#include "util.h"
#include "content_factory.h"
#include "video_content.h"
, _trim_end (0)
, _change_signals_frequent (false)
{
- _paths.push_back (p);
+ add_path (p);
}
Content::Content (shared_ptr<const Film> film, cxml::ConstNodePtr node)
, _change_signals_frequent (false)
{
list<cxml::NodePtr> path_children = node->node_children ("Path");
- for (list<cxml::NodePtr>::const_iterator i = path_children.begin(); i != path_children.end(); ++i) {
- _paths.push_back ((*i)->content ());
+ BOOST_FOREACH (cxml::NodePtr i, path_children) {
+ _paths.push_back (i->content());
+ optional<time_t> const mod = i->optional_number_attribute<time_t>("mtime");
+ if (mod) {
+ _last_write_times.push_back (*mod);
+ } else if (boost::filesystem::exists(i->content())) {
+ _last_write_times.push_back (boost::filesystem::last_write_time(i->content()));
+ } else {
+ _last_write_times.push_back (0);
+ }
}
_digest = node->optional_string_child ("Digest").get_value_or ("X");
_position = DCPTime (node->number_child<DCPTime::Type> ("Position"));
}
for (size_t j = 0; j < c[i]->number_of_paths(); ++j) {
- _paths.push_back (c[i]->path (j));
+ _paths.push_back (c[i]->path(j));
+ _last_write_times.push_back (c[i]->_last_write_times[j]);
}
}
}
boost::mutex::scoped_lock lm (_mutex);
if (with_paths) {
- for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
- node->add_child("Path")->add_child_text (i->string ());
+ for (size_t i = 0; i < _paths.size(); ++i) {
+ xmlpp::Element* p = node->add_child("Path");
+ p->add_child_text (_paths[i].string());
+ p->set_attribute ("mtime", raw_convert<string>(_last_write_times[i]));
}
}
node->add_child("Digest")->add_child_text (_digest);
}
}
-void
-Content::examine (shared_ptr<Job> job)
+string
+Content::calculate_digest () const
{
- if (job) {
- job->sub (_("Computing digest"));
- }
-
boost::mutex::scoped_lock lm (_mutex);
vector<boost::filesystem::path> p = _paths;
lm.unlock ();
digest here: a digest of the first and last 1e6 bytes with the
size of the first file tacked on the end as a string.
*/
- string const d = digest_head_tail (p, 1000000) + raw_convert<string> (boost::filesystem::file_size (p.front ()));
+ return digest_head_tail(p, 1000000) + raw_convert<string>(boost::filesystem::file_size(p.front()));
+}
+
+void
+Content::examine (shared_ptr<Job> job)
+{
+ if (job) {
+ job->sub (_("Computing digest"));
+ }
- lm.lock ();
+ string const d = calculate_digest ();
+
+ boost::mutex::scoped_lock lm (_mutex);
_digest = d;
+
+ _last_write_times.clear ();
+ BOOST_FOREACH (boost::filesystem::path i, _paths) {
+ _last_write_times.push_back (boost::filesystem::last_write_time(i));
+ }
}
void
audio->modify_position (p);
}
- ContentChange cc (this, ContentProperty::POSITION);
+ ChangeSignaller<Content> cc (this, ContentProperty::POSITION);
{
boost::mutex::scoped_lock lm (_mutex);
audio->modify_trim_start (t);
}
- ContentChange cc (this, ContentProperty::TRIM_START);
+ ChangeSignaller<Content> cc (this, ContentProperty::TRIM_START);
{
boost::mutex::scoped_lock lm (_mutex);
void
Content::set_trim_end (ContentTime t)
{
- ContentChange cc (this, ContentProperty::TRIM_END);
+ ChangeSignaller<Content> cc (this, ContentProperty::TRIM_END);
{
boost::mutex::scoped_lock lm (_mutex);
string
Content::technical_summary () const
{
- return String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
+ string s = String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
+ if (_video_frame_rate) {
+ s += String::compose(" %1", *_video_frame_rate);
+ }
+ return s;
}
DCPTime
bool
Content::paths_valid () const
{
- for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
- if (!boost::filesystem::exists (*i)) {
+ BOOST_FOREACH (boost::filesystem::path i, _paths) {
+ if (!boost::filesystem::exists (i)) {
return false;
}
}
return true;
}
-void
-Content::set_path (boost::filesystem::path path)
-{
- ContentChange cc (this, ContentProperty::PATH);
- _paths.clear ();
- _paths.push_back (path);
-}
-
void
Content::set_paths (vector<boost::filesystem::path> paths)
{
- ContentChange cc (this, ContentProperty::PATH);
- _paths = paths;
+ ChangeSignaller<Content> cc (this, ContentProperty::PATH);
+
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _paths = paths;
+ _last_write_times.clear ();
+ BOOST_FOREACH (boost::filesystem::path i, _paths) {
+ _last_write_times.push_back (boost::filesystem::last_write_time(i));
+ }
+ }
}
string
void
Content::set_video_frame_rate (double r)
{
- ContentChange cc (this, ContentProperty::VIDEO_FRAME_RATE);
+ ChangeSignaller<Content> cc (this, ContentProperty::VIDEO_FRAME_RATE);
{
boost::mutex::scoped_lock lm (_mutex);
void
Content::unset_video_frame_rate ()
{
- ContentChange cc (this, ContentProperty::VIDEO_FRAME_RATE);
+ ChangeSignaller<Content> cc (this, ContentProperty::VIDEO_FRAME_RATE);
{
boost::mutex::scoped_lock lm (_mutex);
return shared_ptr<TextContent> ();
}
+
+void
+Content::add_path (boost::filesystem::path p)
+{
+ boost::mutex::scoped_lock lm (_mutex);
+ _paths.push_back (p);
+ _last_write_times.push_back (boost::filesystem::last_write_time(p));
+}