X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=c6cede5fa6cafde4d04f18dc1943a3551c858a2c;hb=59e769023c392c332331567a1aea94660002c463;hp=e383f9ff0a599e52e5ba6a97a4083f7cec773ea3;hpb=cf8e0e9e26dbaefab768000ebc1655b34ad11105;p=dcpomatic.git

diff --git a/src/lib/content.h b/src/lib/content.h
index e383f9ff0..c6cede5fa 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
@@ -66,9 +66,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 +79,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 +106,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 +169,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;