* @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 "exceptions.h"
#include "film.h"
#include "safe_stringstream.h"
+#include "job.h"
+#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
+#include <libxml++/libxml++.h>
+#include <boost/thread/mutex.hpp>
#include "i18n.h"
using std::string;
-using std::set;
using std::list;
using std::cout;
using std::vector;
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");
+ _digest = node->optional_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"));
for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
node->add_child("Path")->add_child_text (i->string ());
}
- node->add_child("Digest")->add_child_text (_digest);
+ if (_digest) {
+ node->add_child("Digest")->add_child_text (_digest.get ());
+ }
node->add_child("Position")->add_child_text (raw_convert<string> (_position.get ()));
node->add_child("TrimStart")->add_child_text (raw_convert<string> (_trim_start.get ()));
node->add_child("TrimEnd")->add_child_text (raw_convert<string> (_trim_end.get ()));
}
void
-Content::examine (shared_ptr<Job> job)
+Content::examine (shared_ptr<Job> job, bool calculate_digest)
{
+ if (!calculate_digest) {
+ return;
+ }
+
+ if (job) {
+ job->sub (_("Computing digest"));
+ }
+
boost::mutex::scoped_lock lm (_mutex);
vector<boost::filesystem::path> p = _paths;
lm.unlock ();
string
Content::technical_summary () const
{
- return String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
+ return String::compose ("%1 %2 %3", path_summary(), digest().get_value_or("X"), position().seconds());
}
DCPTime
{
SafeStringStream s;
- s << Content::digest()
+ s << Content::digest().get_value_or("X")
<< "_" << position().get()
<< "_" << trim_start().get()
<< "_" << trim_end().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) {