Merge.

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 1eee02e01463e434bd65acd3a1bac53bd7f72170..fc3a531faf8293b69d484581810b0ea3fd351801 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -27,6 +27,7 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <libxml++/libxml++.h>
 #include "types.h"
+#include "dcpomatic_time.h"
 
 namespace cxml {
        class Node;
@@ -57,6 +58,9 @@ public:
        
        virtual void examine (boost::shared_ptr<Job>);
        virtual std::string summary () const = 0;
+       /** @return Technical details of this content; these are written to logs to
+        *  help with debugging.
+        */
        virtual std::string technical_summary () const;
        virtual std::string information () const = 0;
        virtual void as_xml (xmlpp::Node *) const;
@@ -84,7 +88,7 @@ public:
                return _paths[i];
        }
        
-       bool path_valid () const;
+       bool paths_valid () const;
 
        /** @return MD5 digest of the content's file(s) */
        std::string digest () const {
@@ -117,7 +121,7 @@ public:
        }
        
        DCPTime end () const {
-               return position() + length_after_trim() - 1;
+               return position() + length_after_trim();
        }
 
        DCPTime length_after_trim () const;
@@ -126,8 +130,6 @@ public:
                _change_signals_frequent = f;
        }
 
-       bool trimmed (DCPTime) const;
-
        boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
 
 protected: