No-op: remove all trailing whitespace.

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 1fb4681a251b2810c662426912114f6a2af181e7..aa382d68b9e5f53fa233e70a6d4925ae65a73b9e 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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
@@ -17,26 +17,30 @@
 
 */
 
-#include <boost/thread/mutex.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
+/** @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 <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <boost/thread/mutex.hpp>
 
 #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<const Film> f)
-       : _film (f)
+Content::Content (shared_ptr<const Film> film)
+       : _film (film)
        , _position (0)
        , _trim_start (0)
        , _trim_end (0)
@@ -54,8 +58,8 @@ Content::Content (shared_ptr<const Film> f)
 
 }
 
-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)
@@ -64,8 +68,8 @@ Content::Content (shared_ptr<const Film> f, DCPTime p)
 
 }
 
-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)
@@ -74,22 +78,22 @@ Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
        _paths.push_back (p);
 }
 
-Content::Content (shared_ptr<const Film> f, shared_ptr<const cxml::Node> 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");
+       _digest = node->optional_string_child ("Digest").get_value_or ("X");
        _position = DCPTime (node->number_child<double> ("Position"));
        _trim_start = DCPTime (node->number_child<double> ("TrimStart"));
        _trim_end = DCPTime (node->number_child<double> ("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 ())
@@ -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<string> (_position.get ()));
-       node->add_child("TrimStart")->add_child_text (lexical_cast<string> (_trim_start.get ()));
-       node->add_child("TrimEnd")->add_child_text (lexical_cast<string> (_trim_end.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)
 {
+       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;
@@ -140,9 +152,7 @@ Content::examine (shared_ptr<Job> 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,7 +200,7 @@ Content::clone () const
        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");
@@ -210,7 +220,7 @@ Content::technical_summary () const
 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
@@ -219,8 +229,8 @@ Content::length_after_trim () const
 string
 Content::identifier () const
 {
-       stringstream s;
-       
+       SafeStringStream s;
+
        s << Content::digest()
          << "_" << position().get()
          << "_" << trim_start().get()
@@ -254,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) {