X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=4c71c9e1618efabdf9b7ce95f850d551cb1306e7;hp=f5c20bccdbec79048285b82ab5ce4b87e802bfcd;hb=e519feaca11005d330e7b8403b948d4ad9cc3ae8;hpb=ca981c8cfa23111e92be329f1c2dfbe3a07b4247

diff --git a/src/lib/film.h b/src/lib/film.h
index f5c20bccd..4c71c9e16 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -32,6 +32,7 @@
 #include "frame_rate_change.h"
 #include "signaller.h"
 #include "dcp_text_track.h"
+#include <dcp/language_tag.h>
 #include <dcp/key.h>
 #include <dcp/encrypted_kdm.h>
 #include <boost/signals2.hpp>
@@ -140,6 +141,7 @@ public:
 
 	dcp::Size full_frame () const;
 	dcp::Size frame_size () const;
+	dcp::Size active_area () const;
 
 	std::vector<CPLSummary> cpls () const;
 
@@ -173,9 +175,7 @@ public:
 		return _state_version;
 	}
 
-	std::string subtitle_language () const;
-
-	std::vector<std::string> audio_output_names () const;
+	std::vector<NamedChannel> audio_output_names () const;
 
 	void repeat_content (ContentList, int);
 
@@ -229,7 +229,17 @@ public:
 		REENCODE_J2K,
 		MARKERS,
 		RATINGS,
-		CONTENT_VERSION
+		CONTENT_VERSIONS,
+		NAME_LANGUAGE,
+		AUDIO_LANGUAGE,
+		RELEASE_TERRITORY,
+		VERSION_NUMBER,
+		STATUS,
+		CHAIN,
+		DISTRIBUTOR,
+		FACILITY,
+		LUMINANCE,
+		SUBTITLE_LANGUAGES
 	};
 
 
@@ -316,8 +326,10 @@ public:
 		return _reencode_j2k;
 	}
 
+	typedef std::map<dcp::Marker, dcpomatic::DCPTime> Markers;
+
 	boost::optional<dcpomatic::DCPTime> marker (dcp::Marker type) const;
-	std::map<dcp::Marker, dcpomatic::DCPTime> markers () const {
+	Markers markers () const {
 		return _markers;
 	}
 
@@ -325,8 +337,48 @@ public:
 		return _ratings;
 	}
 
-	std::string content_version () const {
-		return _content_version;
+	std::vector<std::string> content_versions () const {
+		return _content_versions;
+	}
+
+	dcp::LanguageTag name_language () const {
+		return _name_language;
+	}
+
+	dcp::LanguageTag audio_language () const {
+		return _audio_language;
+	}
+
+	dcp::LanguageTag::RegionSubtag release_territory () const {
+		return _release_territory;
+	}
+
+	int version_number () const {
+		return _version_number;
+	}
+
+	dcp::Status status () const {
+		return _status;
+	}
+
+	std::string chain () const {
+		return _chain;
+	}
+
+	std::string distributor () const {
+		return _distributor;
+	}
+
+	std::string facility () const {
+		return _facility;
+	}
+
+	dcp::Luminance luminance () const {
+		return _luminance;
+	}
+
+	std::vector<dcp::LanguageTag> subtitle_languages () const {
+		return _subtitle_languages;
 	}
 
 	/* SET */
@@ -360,7 +412,21 @@ public:
 	void unset_marker (dcp::Marker type);
 	void clear_markers ();
 	void set_ratings (std::vector<dcp::Rating> r);
-	void set_content_version (std::string v);
+	void set_content_versions (std::vector<std::string> v);
+	void set_name_language (dcp::LanguageTag lang);
+	void set_audio_language (dcp::LanguageTag lang);
+	void set_release_territory (dcp::LanguageTag::RegionSubtag region);
+	void set_version_number (int v);
+	void set_status (dcp::Status s);
+	void set_chain (std::string c);
+	void set_facility (std::string f);
+	void set_distributor (std::string d);
+	void set_luminance (dcp::Luminance l);
+	void set_subtitle_language (dcp::LanguageTag language);
+	void unset_subtitle_language ();
+	void set_subtitle_languages (std::vector<dcp::LanguageTag> languages);
+
+	void add_ffoc_lfoc (Markers& markers) const;
 
 	/** Emitted when some property has of the Film is about to change or has changed */
 	mutable boost::signals2::signal<void (ChangeType, Property)> Change;
@@ -454,7 +520,17 @@ private:
 	bool _user_explicit_resolution;
 	std::map<dcp::Marker, dcpomatic::DCPTime> _markers;
 	std::vector<dcp::Rating> _ratings;
-	std::string _content_version;
+	std::vector<std::string> _content_versions;
+	dcp::LanguageTag _name_language;
+	dcp::LanguageTag _audio_language;
+	dcp::LanguageTag::RegionSubtag _release_territory;
+	int _version_number;
+	dcp::Status _status;
+	std::string _chain;
+	std::string _distributor;
+	std::string _facility;
+	dcp::Luminance _luminance;
+	std::vector<dcp::LanguageTag> _subtitle_languages;
 
 	int _state_version;