X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=7c4c72f7b2689835cc7963b02f80956995c34fc8;hb=b1873c51b2e8265a01a8f0eced7fc3465f1677dc;hp=d3530b81772ac43f117d2d4f2734778c9d0d28c9;hpb=d1b20374b1bd02b2929c9c3080c006874b525ef5;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index d3530b817..7c4c72f7b 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -38,6 +38,7 @@ extern "C" {
 #include "dcp_content_type.h"
 #include "util.h"
 #include "stream.h"
+#include "dci_metadata.h"
 
 class Format;
 class Job;
@@ -59,7 +60,11 @@ public:
 	Film (Film const &);
 	~Film ();
 
-	std::string j2k_dir () const;
+	std::string hash_dir () const;
+	std::string j2c_path (int f, bool t) const;
+	std::string hash_path (int f) const;
+	std::string video_mxf_dir () const;
+	std::string video_mxf_filename () const;
 
 	void examine_content ();
 	void send_dcp_to_tms ();
@@ -87,10 +92,13 @@ public:
 	void read_metadata ();
 
 	libdcp::Size cropped_size (libdcp::Size) const;
-	boost::optional<int> dcp_length () const;
 	std::string dci_name () const;
 	std::string dcp_name () const;
 
+	boost::optional<int> dcp_intrinsic_duration () const {
+		return _dcp_intrinsic_duration;
+	}
+
 	/** @return true if our state has changed since we last saved it */
 	bool dirty () const {
 		return _dirty;
@@ -114,8 +122,8 @@ public:
 		CROP,
 		FILTERS,
 		SCALER,
-		DCP_TRIM_START,
-		DCP_TRIM_END,
+		TRIM_START,
+		TRIM_END,
 		DCP_AB,
 		CONTENT_AUDIO_STREAM,
 		EXTERNAL_AUDIO,
@@ -132,6 +140,7 @@ public:
 		DCI_METADATA,
 		SIZE,
 		LENGTH,
+		DCP_INTRINSIC_DURATION,
 		CONTENT_AUDIO_STREAMS,
 		SUBTITLE_STREAMS,
 		FRAMES_PER_SECOND,
@@ -190,14 +199,14 @@ public:
 		return _scaler;
 	}
 
-	SourceFrame dcp_trim_start () const {
+	int trim_start () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
-		return _dcp_trim_start;
+		return _trim_start;
 	}
 
-	SourceFrame dcp_trim_end () const {
+	int trim_end () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
-		return _dcp_trim_end;
+		return _trim_end;
 	}
 
 	bool dcp_ab () const {
@@ -235,6 +244,8 @@ public:
 		return _still_duration;
 	}
 
+	int still_duration_in_frames () const;
+
 	boost::shared_ptr<SubtitleStream> subtitle_stream () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _subtitle_stream;
@@ -265,41 +276,11 @@ public:
 		return _j2k_bandwidth;
 	}
 
-	std::string audio_language () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _audio_language;
-	}
-	
-	std::string subtitle_language () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _subtitle_language;
-	}
-	
-	std::string territory () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _territory;
-	}
-	
-	std::string rating () const {
+	DCIMetadata dci_metadata () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
-		return _rating;
+		return _dci_metadata;
 	}
 	
-	std::string studio () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _studio;
-	}
-	
-	std::string facility () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _facility;
-	}
-	
-	std::string package_type () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _package_type;
-	}
-
 	libdcp::Size size () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _size;
@@ -353,8 +334,8 @@ public:
 	void set_bottom_crop (int);
 	void set_filters (std::vector<Filter const *>);
 	void set_scaler (Scaler const *);
-	void set_dcp_trim_start (int);
-	void set_dcp_trim_end (int);
+	void set_trim_start (int);
+	void set_trim_end (int);
 	void set_dcp_ab (bool);
 	void set_content_audio_stream (boost::shared_ptr<AudioStream>);
 	void set_external_audio (std::vector<std::string>);
@@ -368,16 +349,11 @@ public:
 	void set_subtitle_scale (float);
 	void set_colour_lut (int);
 	void set_j2k_bandwidth (int);
-	void set_audio_language (std::string);
-	void set_subtitle_language (std::string);
-	void set_territory (std::string);
-	void set_rating (std::string);
-	void set_studio (std::string);
-	void set_facility (std::string);
-	void set_package_type (std::string);
+	void set_dci_metadata (DCIMetadata);
 	void set_size (libdcp::Size);
 	void set_length (SourceFrame);
 	void unset_length ();
+	void set_dcp_intrinsic_duration (int);
 	void set_content_digest (std::string);
 	void set_content_audio_streams (std::vector<boost::shared_ptr<AudioStream> >);
 	void set_subtitle_streams (std::vector<boost::shared_ptr<SubtitleStream> >);
@@ -402,6 +378,7 @@ private:
 
 	void signal_changed (Property);
 	void examine_content_finished ();
+	std::string video_state_identifier () const;
 
 	/** Complete path to directory containing the film metadata;
 	 *  must not be relative.
@@ -434,9 +411,9 @@ private:
 	/** Scaler algorithm to use */
 	Scaler const * _scaler;
 	/** Frames to trim off the start of the DCP */
-	int _dcp_trim_start;
+	int _trim_start;
 	/** Frames to trim off the end of the DCP */
-	int _dcp_trim_end;
+	int _trim_end;
 	/** true to create an A/B comparison DCP, where the left half of the image
 	    is the video without any filters or post-processing, and the right half
 	    has the specified filters and post-processing.
@@ -472,22 +449,17 @@ private:
 	int _colour_lut;
 	/** bandwidth for J2K files in bits per second */
 	int _j2k_bandwidth;
-	
-	/* DCI naming stuff */
-	std::string _audio_language;
-	std::string _subtitle_language;
-	std::string _territory;
-	std::string _rating;
-	std::string _studio;
-	std::string _facility;
-	std::string _package_type;
+
+	/** DCI naming stuff */
+	DCIMetadata _dci_metadata;
 
 	/* Data which are cached to speed things up */
 
-	/** libdcp::Size, in pixels, of the source (ignoring cropping) */
+	/** Size, in pixels, of the source (ignoring cropping) */
 	libdcp::Size _size;
 	/** The length of the source, in video frames (as far as we know) */
 	boost::optional<SourceFrame> _length;
+	boost::optional<int> _dcp_intrinsic_duration;
 	/** MD5 digest of our content file */
 	std::string _content_digest;
 	/** The audio streams in our content */