X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ffilm.h;h=178fd9002d18cff8b586790d5d14c473e796374b;hb=4616b19fb5241a54c9d57f7a91bb975f41aed14b;hp=67d00aa54afe8d977a26ffc1edddb18a5a36b009;hpb=e846c98e5f64d3179fb2eebefb0c76b57bc53b93;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 67d00aa54..178fd9002 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -115,7 +115,6 @@ public:
 
 	ContentList content () const;
 	DCPTime length () const;
-	bool has_subtitles () const;
 	int best_video_frame_rate () const;
 	FrameRateChange active_frame_rate_change (DCPTime) const;
 
@@ -124,14 +123,16 @@ public:
 		boost::shared_ptr<dcp::Certificate> target,
 		boost::filesystem::path cpl_file,
 		dcp::LocalTime from,
-		dcp::LocalTime until
+		dcp::LocalTime until,
+		dcp::Formulation formulation
 		) const;
 	
 	std::list<dcp::EncryptedKDM> make_kdms (
 		std::list<boost::shared_ptr<Screen> >,
 		boost::filesystem::path cpl_file,
 		dcp::LocalTime from,
-		dcp::LocalTime until
+		dcp::LocalTime until,
+		dcp::Formulation formulation
 		) const;
 
 	dcp::Key key () const {
@@ -149,13 +150,12 @@ public:
 		NONE,
 		NAME,
 		USE_ISDCF_NAME,
-		/** The playlist's content list has changed (i.e. content has been added, moved around or removed) */
+		/** The playlist's content list has changed (i.e. content has been added or removed) */
 		CONTENT,
 		DCP_CONTENT_TYPE,
 		CONTAINER,
 		RESOLUTION,
 		SCALER,
-		WITH_SUBTITLES,
 		SIGNED,
 		ENCRYPTED,
 		J2K_BANDWIDTH,
@@ -199,10 +199,6 @@ public:
 		return _scaler;
 	}
 
-	bool with_subtitles () const {
-		return _with_subtitles;
-	}
-
 	/* signed is a reserved word */
 	bool is_signed () const {
 		return _signed;
@@ -256,7 +252,6 @@ public:
 	void set_container (Ratio const *);
 	void set_resolution (Resolution);
 	void set_scaler (Scaler const *);
-	void set_with_subtitles (bool);
 	void set_signed (bool);
 	void set_encrypted (bool);
 	void set_j2k_bandwidth (int);
@@ -309,8 +304,6 @@ private:
 	Resolution _resolution;
 	/** Scaler algorithm to use */
 	Scaler const * _scaler;
-	/** True if subtitles should be shown for this film */
-	bool _with_subtitles;
 	bool _signed;
 	bool _encrypted;
 	/** bandwidth for J2K files in bits per second */