X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=aa382d68b9e5f53fa233e70a6d4925ae65a73b9e;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=8e3b99da89b43027ede972e2b3200d2f63754475;hpb=e8c1880a2b9a40eb11ee259feee3edd799139a43;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index 8e3b99da8..aa382d68b 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington 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 @@ -17,26 +17,30 @@ */ -#include -#include -#include +/** @file src/lib/content.cc + * @brief Content class. + */ + #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 "raw_convert.h" +#include +#include +#include #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 boost::shared_ptr; -using boost::lexical_cast; int const ContentProperty::PATH = 400; int const ContentProperty::POSITION = 401; @@ -44,8 +48,8 @@ int const ContentProperty::LENGTH = 402; int const ContentProperty::TRIM_START = 403; int const ContentProperty::TRIM_END = 404; -Content::Content (shared_ptr f) - : _film (f) +Content::Content (shared_ptr film) + : _film (film) , _position (0) , _trim_start (0) , _trim_end (0) @@ -54,8 +58,8 @@ Content::Content (shared_ptr f) } -Content::Content (shared_ptr f, DCPTime p) - : _film (f) +Content::Content (shared_ptr film, DCPTime p) + : _film (film) , _position (p) , _trim_start (0) , _trim_end (0) @@ -64,8 +68,8 @@ Content::Content (shared_ptr f, DCPTime p) } -Content::Content (shared_ptr f, boost::filesystem::path p) - : _film (f) +Content::Content (shared_ptr film, boost::filesystem::path p) + : _film (film) , _position (0) , _trim_start (0) , _trim_end (0) @@ -74,33 +78,33 @@ Content::Content (shared_ptr f, boost::filesystem::path p) _paths.push_back (p); } -Content::Content (shared_ptr f, shared_ptr node) - : _film (f) +Content::Content (shared_ptr film, cxml::ConstNodePtr node) + : _film (film) , _change_signals_frequent (false) { list path_children = node->node_children ("Path"); for (list::const_iterator i = path_children.begin(); i != path_children.end(); ++i) { _paths.push_back ((*i)->content ()); } - _digest = node->string_child ("Digest"); - _position = node->number_child ("Position"); - _trim_start = node->number_child ("TrimStart"); - _trim_end = node->number_child ("TrimEnd"); + _digest = node->optional_string_child ("Digest").get_value_or ("X"); + _position = DCPTime (node->number_child ("Position")); + _trim_start = DCPTime (node->number_child ("TrimStart")); + _trim_end = DCPTime (node->number_child ("TrimEnd")); } -Content::Content (shared_ptr f, vector > c) - : _film (f) +Content::Content (shared_ptr film, vector > 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 ()) { + if (i > 0 && c[i]->trim_start() > DCPTime()) { 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 ()) { + if (i < (c.size() - 1) && c[i]->trim_end () > DCPTime()) { throw JoinError (_("Only the last piece of content to be joined can have an end trim.")); } @@ -119,19 +123,27 @@ Content::as_xml (xmlpp::Node* node) const node->add_child("Path")->add_child_text (i->string ()); } node->add_child("Digest")->add_child_text (_digest); - node->add_child("Position")->add_child_text (lexical_cast (_position)); - node->add_child("TrimStart")->add_child_text (lexical_cast (_trim_start)); - node->add_child("TrimEnd")->add_child_text (lexical_cast (_trim_end)); + node->add_child("Position")->add_child_text (raw_convert (_position.get ())); + node->add_child("TrimStart")->add_child_text (raw_convert (_trim_start.get ())); + node->add_child("TrimEnd")->add_child_text (raw_convert (_trim_end.get ())); } void Content::examine (shared_ptr job) { + if (job) { + job->sub (_("Computing digest")); + } + boost::mutex::scoped_lock lm (_mutex); vector 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 (boost::filesystem::file_size (p.front ())); lm.lock (); _digest = d; @@ -140,9 +152,7 @@ Content::examine (shared_ptr job) 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 @@ -153,7 +163,7 @@ Content::set_position (DCPTime p) if (p == _position) { return; } - + _position = p; } @@ -190,24 +200,27 @@ Content::clone () const if (!film) { return shared_ptr (); } - + /* 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"); as_xml (node); - return content_factory (film, cxml::NodePtr (new cxml::Node (node)), Film::current_state_version); + + /* notes is unused here (we assume) */ + list notes; + return content_factory (film, cxml::NodePtr (new cxml::Node (node)), Film::current_state_version, notes); } string Content::technical_summary () const { - return String::compose ("%1 %2 %3", path_summary(), digest(), position()); + return String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds()); } DCPTime Content::length_after_trim () const { - return full_length() - trim_start() - trim_end(); + return max (DCPTime (), full_length() - trim_start() - trim_end()); } /** @return string which includes everything about how this content affects @@ -216,12 +229,12 @@ Content::length_after_trim () const string Content::identifier () const { - stringstream s; - + SafeStringStream s; + s << Content::digest() - << "_" << position() - << "_" << trim_start() - << "_" << trim_end(); + << "_" << position().get() + << "_" << trim_start().get() + << "_" << trim_end().get(); return s.str (); } @@ -251,7 +264,7 @@ Content::path_summary () const { /* 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) {