/*
- Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2015 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
* @brief Content class.
*/
-#include <boost/thread/mutex.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
#include "content.h"
#include "util.h"
#include "content_factory.h"
-#include "ui_signaller.h"
#include "exceptions.h"
#include "film.h"
+#include "safe_stringstream.h"
+#include "job.h"
+#include "compose.hpp"
+#include "raw_convert.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <boost/thread/mutex.hpp>
+#include <iostream>
#include "i18n.h"
using std::string;
-using std::stringstream;
-using std::set;
using std::list;
using std::cout;
using std::vector;
+using std::max;
+using std::pair;
using boost::shared_ptr;
-using dcp::raw_convert;
int const ContentProperty::PATH = 400;
int const ContentProperty::POSITION = 401;
int const ContentProperty::TRIM_START = 403;
int const ContentProperty::TRIM_END = 404;
-Content::Content (shared_ptr<const Film> f)
- : _film (f)
+Content::Content (shared_ptr<const Film> film)
+ : _film (film)
, _position (0)
, _trim_start (0)
, _trim_end (0)
}
-Content::Content (shared_ptr<const Film> f, DCPTime p)
- : _film (f)
+Content::Content (shared_ptr<const Film> film, DCPTime p)
+ : _film (film)
, _position (p)
, _trim_start (0)
, _trim_end (0)
}
-Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
- : _film (f)
+Content::Content (shared_ptr<const Film> film, boost::filesystem::path p)
+ : _film (film)
, _position (0)
, _trim_start (0)
, _trim_end (0)
_paths.push_back (p);
}
-Content::Content (shared_ptr<const Film> f, cxml::ConstNodePtr node)
- : _film (f)
+Content::Content (shared_ptr<const Film> film, cxml::ConstNodePtr node)
+ : _film (film)
, _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 ());
}
- _digest = node->string_child ("Digest");
- _position = DCPTime (node->number_child<double> ("Position"));
- _trim_start = DCPTime (node->number_child<double> ("TrimStart"));
- _trim_end = DCPTime (node->number_child<double> ("TrimEnd"));
+ _digest = node->optional_string_child ("Digest").get_value_or ("X");
+ _position = DCPTime (node->number_child<DCPTime::Type> ("Position"));
+ _trim_start = ContentTime (node->number_child<ContentTime::Type> ("TrimStart"));
+ _trim_end = ContentTime (node->number_child<ContentTime::Type> ("TrimEnd"));
}
-Content::Content (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
- : _film (f)
+Content::Content (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+ : _film (film)
, _position (c.front()->position ())
, _trim_start (c.front()->trim_start ())
, _trim_end (c.back()->trim_end ())
, _change_signals_frequent (false)
{
for (size_t i = 0; i < c.size(); ++i) {
- if (i > 0 && c[i]->trim_start() > DCPTime()) {
+ if (i > 0 && c[i]->trim_start() > ContentTime ()) {
throw JoinError (_("Only the first piece of content to be joined can have a start trim."));
}
- if (i < (c.size() - 1) && c[i]->trim_end () > DCPTime()) {
+ if (i < (c.size() - 1) && c[i]->trim_end () > ContentTime ()) {
throw JoinError (_("Only the last piece of content to be joined can have an end trim."));
}
void
Content::examine (shared_ptr<Job> job)
{
+ if (job) {
+ job->sub (_("Computing digest"));
+ }
+
boost::mutex::scoped_lock lm (_mutex);
vector<boost::filesystem::path> p = _paths;
lm.unlock ();
-
- string const d = md5_digest (p, job);
+
+ /* Some content files are very big, so we use a poor man's
+ digest here: a MD5 of the first and last 1e6 bytes with the
+ size of the first file tacked on the end as a string.
+ */
+ string const d = md5_digest_head_tail (p, 1000000) + raw_convert<string> (boost::filesystem::file_size (p.front ()));
lm.lock ();
_digest = d;
void
Content::signal_changed (int p)
{
- if (ui_signaller) {
- ui_signaller->emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent));
- }
+ emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent));
}
void
if (p == _position) {
return;
}
-
+
_position = p;
}
}
void
-Content::set_trim_start (DCPTime t)
+Content::set_trim_start (ContentTime t)
{
{
boost::mutex::scoped_lock lm (_mutex);
}
void
-Content::set_trim_end (DCPTime t)
+Content::set_trim_end (ContentTime t)
{
{
boost::mutex::scoped_lock lm (_mutex);
if (!film) {
return shared_ptr<Content> ();
}
-
+
/* 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");
DCPTime
Content::length_after_trim () const
{
- return full_length() - trim_start() - trim_end();
+ shared_ptr<const Film> film = _film.lock ();
+ DCPOMATIC_ASSERT (film);
+ return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film->active_frame_rate_change (position ())));
}
-/** @return string which includes everything about how this content affects
- * its playlist.
+/** @return string which changes when something about this content changes which affects
+ * the appearance of its video.
*/
string
Content::identifier () const
{
- stringstream s;
-
+ SafeStringStream s;
+
s << Content::digest()
<< "_" << position().get()
<< "_" << trim_start().get()
{
/* XXX: should handle multiple paths more gracefully */
- assert (number_of_paths ());
+ DCPOMATIC_ASSERT (number_of_paths ());
string s = path(0).filename().string ();
if (number_of_paths() > 1) {
return s;
}
+
+/** @return a list of properties that might be interesting to the user; first string is the property name,
+ * second is the value.
+ */
+list<pair<string, string> >
+Content::properties () const
+{
+ list<pair<string, string> > p;
+ add_properties (p);
+ return p;
+}
projects / dcpomatic.git / blobdiff