X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=5bf6c55f7b12a7898dd6afe62f24e3b7b9886f97;hb=476ec5c7e33314b9a0a073e144c9ca996a179321;hp=6cce07c17f3fa23bcb047f660582e02b553e7efa;hpb=cef7a679a59044a5c807768042deecfd56ec6fc2;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 6cce07c17..5bf6c55f7 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -57,10 +57,8 @@ class Content;
 class Playlist;
 class AudioContent;
 class AudioProcessor;
-class AudioMapping;
 class Ratio;
 class Job;
-class ScreenKDM;
 class Film;
 struct isdcf_name_test;
 
@@ -169,16 +167,6 @@ public:
 		boost::optional<int> disable_forensic_marking_audio
 		) const;
 
-	std::list<boost::shared_ptr<ScreenKDM> > make_kdms (
-		std::list<boost::shared_ptr<dcpomatic::Screen> > screens,
-		boost::filesystem::path cpl_file,
-		boost::posix_time::ptime from,
-		boost::posix_time::ptime until,
-		dcp::Formulation formulation,
-		bool disable_forensic_marking_picture,
-		boost::optional<int> disable_forensic_marking_audio
-		) const;
-
 	int state_version () const {
 		return _state_version;
 	}
@@ -362,8 +350,8 @@ public:
 	void move_content_earlier (boost::shared_ptr<Content>);
 	void move_content_later (boost::shared_ptr<Content>);
 	void set_dcp_content_type (DCPContentType const *);
-	void set_container (Ratio const *);
-	void set_resolution (Resolution);
+	void set_container (Ratio const *, bool user_explicit = true);
+	void set_resolution (Resolution, bool user_explicit = true);
 	void set_signed (bool);
 	void set_encrypted (bool);
 	void set_key (dcp::Key key);
@@ -420,6 +408,7 @@ private:
 	void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>, bool disable_audio_analysis);
 	void audio_analysis_finished ();
 	void check_settings_consistency ();
+	void maybe_set_container_and_resolution ();
 
 	static std::string const metadata_file;
 
@@ -473,6 +462,8 @@ private:
 	bool _reencode_j2k;
 	/** true if the user has ever explicitly set the video frame rate of this film */
 	bool _user_explicit_video_frame_rate;
+	bool _user_explicit_container;
+	bool _user_explicit_resolution;
 	std::map<dcp::Marker, dcpomatic::DCPTime> _markers;
 	std::vector<dcp::Rating> _ratings;
 	std::string _content_version;