X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=55412c2e88b03936ef35e297b7f77699adebb55e;hb=4becf7d0cb19fbbdad4f31b0881b77e689d2c1d6;hp=d42eb5626b71dad5050e3fa5335002611f59edf1;hpb=04f8ba59d17e726570b4c1f361f10c7548fbe5c2;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index d42eb5626..55412c2e8 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -31,12 +31,14 @@
 
 #include "change_signaller.h"
 #include "dcp_text_track.h"
+#include "dcpomatic_time.h"
 #include "frame_rate_change.h"
+#include "resolution.h"
 #include "signaller.h"
 #include "transcode_job.h"
-#include "types.h"
 #include "util.h"
 #include <dcp/encrypted_kdm.h>
+#include <dcp/file.h>
 #include <dcp/key.h>
 #include <dcp/language_tag.h>
 #include <dcp/rating.h>
@@ -75,13 +77,8 @@ class InfoFileHandle
 {
 public:
 	InfoFileHandle (boost::mutex& mutex, boost::filesystem::path file, bool read);
-	~InfoFileHandle ();
 
-	FILE* get () const {
-		return _handle;
-	}
-
-	boost::filesystem::path file () const {
+	dcp::File& get () {
 		return _file;
 	}
 
@@ -89,10 +86,10 @@ private:
 	friend class Film;
 
 	boost::mutex::scoped_lock _lock;
-	FILE* _handle;
-	boost::filesystem::path _file;
+	dcp::File _file;
 };
 
+
 /** @class Film
  *
  *  @brief A representation of some audio, video, subtitle and closed-caption content,
@@ -214,6 +211,8 @@ public:
 		return _tolerant;
 	}
 
+	bool last_written_by_earlier_than(int major, int minor, int micro) const;
+
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
 	*/
@@ -520,6 +519,8 @@ private:
 	 */
 	boost::optional<boost::filesystem::path> _directory;
 
+	boost::optional<std::string> _last_written_by;
+
 	/** Name for DCP-o-matic */
 	std::string _name;
 	/** True if a auto-generated ISDCF-compliant name should be used for our DCP */