Merge branch 'master' into 12bit

[dcpomatic.git] / src / lib / content.cc

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 16069b7a7967b52a1200c40d241e2a6e91ff20eb..11a4b21cca3026706911cb0c51ea9230eabc8797 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -20,17 +20,25 @@
 #include <boost/thread/mutex.hpp>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
+#include <libdcp/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 "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;
+using libdcp::raw_convert;
 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;
@@ -72,38 +80,60 @@ Content::Content (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
        : _film (f)
        , _change_signals_frequent (false)
 {
-       _paths.push_back (node->string_child ("Path"));
+       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 = node->number_child<Time> ("Position");
        _trim_start = node->number_child<Time> ("TrimStart");
        _trim_end = node->number_child<Time> ("TrimEnd");
 }
 
+Content::Content (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
+       : _film (f)
+       , _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 ()) {
+                       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 ()) {
+                       throw JoinError (_("Only the last piece of content to be joined can have an end trim."));
+               }
+
+               for (size_t j = 0; j < c[i]->number_of_paths(); ++j) {
+                       _paths.push_back (c[i]->path (j));
+               }
+       }
+}
+
 void
 Content::as_xml (xmlpp::Node* node) const
 {
        boost::mutex::scoped_lock lm (_mutex);
-       
-       node->add_child("Path")->add_child_text (_paths.front().string());
+
+       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);
-       node->add_child("Position")->add_child_text (lexical_cast<string> (_position));
-       node->add_child("TrimStart")->add_child_text (lexical_cast<string> (_trim_start));
-       node->add_child("TrimEnd")->add_child_text (lexical_cast<string> (_trim_end));
+       node->add_child("Position")->add_child_text (raw_convert<string> (_position));
+       node->add_child("TrimStart")->add_child_text (raw_convert<string> (_trim_start));
+       node->add_child("TrimEnd")->add_child_text (raw_convert<string> (_trim_end));
 }
 
 void
 Content::examine (shared_ptr<Job> job)
 {
        boost::mutex::scoped_lock lm (_mutex);
-       boost::filesystem::path p = _paths.front ();
+       vector<boost::filesystem::path> p = _paths;
        lm.unlock ();
        
-       string d;
-       if (boost::filesystem::is_regular_file (p)) {
-               d = md5_digest (p);
-       } else {
-               d = md5_digest_directory (p, job);
-       }
+       string const d = md5_digest (p, job);
 
        lm.lock ();
        _digest = d;
@@ -122,6 +152,10 @@ Content::set_position (Time p)
 {
        {
                boost::mutex::scoped_lock lm (_mutex);
+               if (p == _position) {
+                       return;
+               }
+               
                _position = p;
        }
 
@@ -163,7 +197,10 @@ Content::clone () const
        xmlpp::Document doc;
        xmlpp::Node* node = doc.create_root_node ("Content");
        as_xml (node);
-       return content_factory (film, cxml::NodePtr(new cxml::Node (node)));
+
+       /* notes is unused here (we assume) */
+       list<string> notes;
+       return content_factory (film, cxml::NodePtr (new cxml::Node (node)), Film::current_state_version, notes);
 }
 
 string
@@ -175,7 +212,7 @@ Content::technical_summary () const
 Time
 Content::length_after_trim () const
 {
-       return full_length() - trim_start() - trim_end();
+       return max (int64_t (0), full_length() - trim_start() - trim_end());
 }
 
 /** @param t A time relative to the start of this content (not the position).
@@ -193,7 +230,7 @@ Content::trimmed (Time t) const
 string
 Content::identifier () const
 {
-       stringstream s;
+       SafeStringStream s;
        
        s << Content::digest()
          << "_" << position()
@@ -204,9 +241,15 @@ Content::identifier () const
 }
 
 bool
-Content::path_valid () const
+Content::paths_valid () const
 {
-       return boost::filesystem::exists (_paths.front ());
+       for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
+               if (!boost::filesystem::exists (*i)) {
+                       return false;
+               }
+       }
+
+       return true;
 }
 
 void
@@ -222,6 +265,8 @@ Content::path_summary () const
 {
        /* XXX: should handle multiple paths more gracefully */
 
+       assert (number_of_paths ());
+
        string s = path(0).filename().string ();
        if (number_of_paths() > 1) {
                s += " ...";