Fix recovery of partial video MXF.

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

diff --git a/src/lib/content.h b/src/lib/content.h
index e383f9ff0a599e52e5ba6a97a4083f7cec773ea3..2b966110bfd398d65f58f545a8052db5ccff8f6b 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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
@@ -25,6 +25,7 @@
 #define DCPOMATIC_CONTENT_H
 
 #include "types.h"
+#include "signaller.h"
 #include "dcpomatic_time.h"
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
@@ -53,7 +54,7 @@ public:
 /** @class Content
  *  @brief A piece of content represented by one or more files on disk.
  */
-class Content : public boost::enable_shared_from_this<Content>, public boost::noncopyable
+class Content : public boost::enable_shared_from_this<Content>, public Signaller, public boost::noncopyable
 {
 public:
        Content (boost::shared_ptr<const Film>);
@@ -66,9 +67,8 @@ public:
        /** Examine the content to establish digest, frame rates and any other
         *  useful metadata.
         *  @param job Job to use to report progress, or 0.
-        *  @param calculate_digest True to calculate a digest for the content's file(s).
         */
-       virtual void examine (boost::shared_ptr<Job> job, bool calculate_digest);
+       virtual void examine (boost::shared_ptr<Job> job);
        
        /** @return Quick one-line summary of the content, as will be presented in the
         *  film editor.
@@ -80,7 +80,6 @@ public:
         */
        virtual std::string technical_summary () const;
        
-       virtual std::string information () const = 0;
        virtual void as_xml (xmlpp::Node *) const;
        virtual DCPTime full_length () const = 0;
        virtual std::string identifier () const;
@@ -108,8 +107,11 @@ public:
        
        bool paths_valid () const;
 
-       /** @return MD5 digest of the content's file(s) */
-       boost::optional<std::string> digest () const {
+       /** @return Digest of the content's file(s).  Note: this is
+        *  not a complete MD5-or-whatever hash, but a sort of poor
+        *  man' version (see comments in ::examine).
+        */
+       std::string digest () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _digest;
        }
@@ -168,7 +170,7 @@ protected:
        std::vector<boost::filesystem::path> _paths;
        
 private:
-       boost::optional<std::string> _digest;
+       std::string _digest;
        DCPTime _position;
        DCPTime _trim_start;
        DCPTime _trim_end;