X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=4b07f84a928503befb9fd231ab2f4a0a8efd97e9;hb=3eda767ad2e9a3512405802dfa273923acc3cf07;hp=01fccf7d177e197a344ffbf7354657c96fac54d3;hpb=5d398836a9b6acc2bbb536dabbd7bbc42a098659;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 01fccf7d1..4b07f84a9 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -58,15 +58,15 @@ class Film : public boost::enable_shared_from_this<Film>, public boost::noncopya
 public:
 	Film (boost::filesystem::path);
 
-	std::string info_dir () const;
-	std::string j2c_path (int, Eyes, bool) const;
-	std::string info_path (int, Eyes) const;
-	std::string internal_video_mxf_dir () const;
-	std::string internal_video_mxf_filename () const;
+	boost::filesystem::path info_dir () const;
+	boost::filesystem::path j2c_path (int, Eyes, bool) const;
+	boost::filesystem::path info_path (int, Eyes) const;
+	boost::filesystem::path internal_video_mxf_dir () const;
+	boost::filesystem::path internal_video_mxf_filename () const;
 	boost::filesystem::path audio_analysis_path (boost::shared_ptr<const AudioContent>) const;
 
-	std::string video_mxf_filename () const;
-	std::string audio_mxf_filename () const;
+	boost::filesystem::path video_mxf_filename () const;
+	boost::filesystem::path audio_mxf_filename () const;
 
 	void send_dcp_to_tms ();
 	void make_dcp ();
@@ -80,8 +80,8 @@ public:
 
 	int encoded_frames () const;
 	
-	std::string file (std::string f) const;
-	std::string dir (std::string d) const;
+	boost::filesystem::path file (boost::filesystem::path f) const;
+	boost::filesystem::path dir (boost::filesystem::path d) const;
 
 	void read_metadata ();
 	void write_metadata () const;
@@ -96,7 +96,7 @@ public:
 
 	libdcp::Size full_frame () const;
 
-	bool have_dcp () const;
+	std::list<boost::filesystem::path> dcps () const;
 
 	boost::shared_ptr<Player> make_player () const;
 	boost::shared_ptr<Playlist> playlist () const;
@@ -111,20 +111,22 @@ public:
 	/* Proxies for some Playlist methods */
 
 	ContentList content () const;
-
 	Time length () const;
 	bool has_subtitles () const;
 	OutputVideoFrame best_video_frame_rate () const;
+	bool content_paths_valid () const;
 
 	libdcp::KDM
 	make_kdm (
 		boost::shared_ptr<libdcp::Certificate> target,
+		boost::filesystem::path dcp,
 		boost::posix_time::ptime from,
 		boost::posix_time::ptime until
 		) const;
 	
 	std::list<libdcp::KDM> make_kdms (
 		std::list<boost::shared_ptr<Screen> >,
+		boost::filesystem::path dcp,
 		boost::posix_time::ptime from,
 		boost::posix_time::ptime until
 		) const;
@@ -147,6 +149,7 @@ public:
 		RESOLUTION,
 		SCALER,
 		WITH_SUBTITLES,
+		SIGNED,
 		ENCRYPTED,
 		J2K_BANDWIDTH,
 		DCI_METADATA,
@@ -161,7 +164,7 @@ public:
 
 	/* GET */
 
-	std::string directory () const {
+	boost::filesystem::path directory () const {
 		return _directory;
 	}
 
@@ -193,6 +196,11 @@ public:
 		return _with_subtitles;
 	}
 
+	/* signed is a reserved word */
+	bool is_signed () const {
+		return _signed;
+	}
+	
 	bool encrypted () const {
 		return _encrypted;
 	}
@@ -229,17 +237,20 @@ public:
 
 	/* SET */
 
-	void set_directory (std::string);
+	void set_directory (boost::filesystem::path);
 	void set_name (std::string);
 	void set_use_dci_name (bool);
 	void examine_and_add_content (boost::shared_ptr<Content>);
 	void add_content (boost::shared_ptr<Content>);
 	void remove_content (boost::shared_ptr<Content>);
+	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_scaler (Scaler const *);
 	void set_with_subtitles (bool);
+	void set_signed (bool);
 	void set_encrypted (bool);
 	void set_j2k_bandwidth (int);
 	void set_dci_metadata (DCIMetadata);
@@ -275,7 +286,7 @@ private:
 	/** Complete path to directory containing the film metadata;
 	 *  must not be relative.
 	 */
-	std::string _directory;
+	boost::filesystem::path _directory;
 	
 	/** Name for DCP-o-matic */
 	std::string _name;
@@ -291,6 +302,7 @@ private:
 	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 */
 	int _j2k_bandwidth;