X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=c722518805855732bda05fcc06c94427997a6cdb;hb=95c48153421b1a6e0d7ca6cf5e67cd7623c03dc7;hp=1c5022428a332563ee586ca1441cfc64756ae69c;hpb=64a5419b16d676d48f36b4699cfe83a91ec78549;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 1c5022428..c72251880 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -36,7 +36,9 @@
 #include <dcp/encrypted_kdm.h>
 #include <boost/signals2.hpp>
 #include <boost/enable_shared_from_this.hpp>
+#include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/thread/mutex.hpp>
 #include <string>
 #include <vector>
 #include <inttypes.h>
@@ -59,8 +61,32 @@ class AudioMapping;
 class Ratio;
 class Job;
 class ScreenKDM;
+class Film;
 struct isdcf_name_test;
 
+class InfoFileHandle
+{
+public:
+	~InfoFileHandle ();
+
+	FILE* get () const {
+		return _handle;
+	}
+
+	boost::filesystem::path file () const {
+		return _file;
+	}
+
+private:
+	friend class Film;
+
+	InfoFileHandle (boost::mutex& mutex, boost::filesystem::path file, bool read);
+
+	boost::mutex::scoped_lock _lock;
+	FILE* _handle;
+	boost::filesystem::path _file;
+};
+
 /** @class Film
  *
  *  @brief A representation of some audio and video content, and details of
@@ -74,7 +100,7 @@ public:
 	explicit Film (boost::optional<boost::filesystem::path> dir);
 	~Film ();
 
-	boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const;
+	boost::shared_ptr<InfoFileHandle> info_file_handle (dcpomatic::DCPTimePeriod period, bool read) const;
 	boost::filesystem::path j2c_path (int, Frame, Eyes, bool) const;
 	boost::filesystem::path internal_video_asset_dir () const;
 	boost::filesystem::path internal_video_asset_filename (dcpomatic::DCPTimePeriod p) const;
@@ -82,7 +108,7 @@ public:
 	boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
 
 	void send_dcp_to_tms ();
-	void make_dcp (bool gui = false);
+	void make_dcp (bool gui = false, bool check = true);
 
 	/** @return Logger.
 	 *  It is safe to call this from any thread.
@@ -174,6 +200,14 @@ public:
 	bool references_dcp_video () const;
 	bool references_dcp_audio () const;
 
+	void set_tolerant (bool t) {
+		_tolerant = t;
+	}
+
+	bool tolerant () const {
+		return _tolerant;
+	}
+
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
 	*/
@@ -205,7 +239,8 @@ public:
 		UPLOAD_AFTER_MAKE_DCP,
 		REENCODE_J2K,
 		MARKERS,
-		RATINGS
+		RATINGS,
+		CONTENT_VERSION
 	};
 
 
@@ -310,6 +345,10 @@ public:
 		return _ratings;
 	}
 
+	std::string content_version () const {
+		return _content_version;
+	}
+
 	/* SET */
 
 	void set_directory (boost::filesystem::path);
@@ -343,6 +382,7 @@ public:
 	void set_marker (dcp::Marker type, dcpomatic::DCPTime time);
 	void unset_marker (dcp::Marker type);
 	void set_ratings (std::vector<dcp::Rating> r);
+	void set_content_version (std::string v);
 
 	/** Emitted when some property has of the Film is about to change or has changed */
 	mutable boost::signals2::signal<void (ChangeType, Property)> Change;
@@ -350,6 +390,11 @@ public:
 	/** Emitted when some property of our content has changed */
 	mutable boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> ContentChange;
 
+	/** Emitted when the film's length might have changed; this is not like a normal
+	    property as its value is derived from the playlist, so it has its own signal.
+	*/
+	mutable boost::signals2::signal<void ()> LengthChange;
+
 	/** Emitted when we have something important to tell the user */
 	boost::signals2::signal<void (std::string)> Message;
 
@@ -361,14 +406,18 @@ private:
 	friend struct ::isdcf_name_test;
 	template <typename> friend class ChangeSignaller;
 
+	boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const;
+
 	void signal_change (ChangeType, Property);
 	void signal_change (ChangeType, int);
 	std::string video_identifier () const;
 	void playlist_change (ChangeType);
 	void playlist_order_changed ();
 	void playlist_content_change (ChangeType type, boost::weak_ptr<Content>, int, bool frequent);
+	void playlist_length_change ();
 	void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>, bool disable_audio_analysis);
 	void audio_analysis_finished ();
+	void check_settings_consistency ();
 
 	static std::string const metadata_file;
 
@@ -424,6 +473,7 @@ private:
 	bool _user_explicit_video_frame_rate;
 	std::map<dcp::Marker, dcpomatic::DCPTime> _markers;
 	std::vector<dcp::Rating> _ratings;
+	std::string _content_version;
 
 	int _state_version;
 
@@ -432,9 +482,17 @@ private:
 	/** film being used as a template, or 0 */
 	boost::shared_ptr<Film> _template_film;
 
+	/** Be tolerant of errors in content (currently applies to DCP only).
+	    Not saved as state.
+	*/
+	bool _tolerant;
+
+	mutable boost::mutex _info_file_mutex;
+
 	boost::signals2::scoped_connection _playlist_change_connection;
 	boost::signals2::scoped_connection _playlist_order_changed_connection;
 	boost::signals2::scoped_connection _playlist_content_change_connection;
+	boost::signals2::scoped_connection _playlist_length_change_connection;
 	std::list<boost::signals2::connection> _job_connections;
 	std::list<boost::signals2::connection> _audio_analysis_connections;