X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=2b966110bfd398d65f58f545a8052db5ccff8f6b;hb=f188128e2577942f030374631d3cf1324a00624a;hp=0b72ada9c52a55d7b822829dce94ceeac134f24c;hpb=c008066160d85b9ec9e5485375d7baaa5d27bda2;p=dcpomatic.git

diff --git a/src/lib/content.h b/src/lib/content.h
index 0b72ada9c..2b966110b 100644
--- 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
@@ -24,15 +24,15 @@
 #ifndef DCPOMATIC_CONTENT_H
 #define DCPOMATIC_CONTENT_H
 
-#include <set>
+#include "types.h"
+#include "signaller.h"
+#include "dcpomatic_time.h"
+#include <libxml++/libxml++.h>
+#include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
-#include "types.h"
-#include "dcpomatic_time.h"
 
 namespace cxml {
 	class Node;
@@ -54,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>);
@@ -67,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.
@@ -81,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;
@@ -109,7 +107,10 @@ public:
 	
 	bool paths_valid () const;
 
-	/** @return MD5 digest of the content's file(s) */
+       /** @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;