X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=6d707670f27eb6bc267d98cefe7bbcd487cdc31f;hb=2f796cd531de522a3b7ed03a9942f3c55f3a0b5b;hp=763b3e903358ff1809e289486bc1a6b504e8f7d5;hpb=979452c78fe2b9aeb6a802d2d900fb83083f9a8a;p=dcpomatic.git

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 763b3e903..6d707670f 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -61,8 +61,8 @@ public:
 		return boost::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
 	}
 
-	DCPTime full_length (boost::shared_ptr<const Film> film) const;
-	DCPTime approximate_length () const;
+	dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime approximate_length () const;
 
 	void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
 	std::string summary () const;
@@ -72,7 +72,7 @@ public:
 	void take_settings_from (boost::shared_ptr<const Content> c);
 
 	void set_default_colour_conversion ();
-	std::list<DCPTime> reel_split_points (boost::shared_ptr<const Film> film) const;
+	std::list<dcpomatic::DCPTime> reel_split_points (boost::shared_ptr<const Film> film) const;
 
 	std::vector<boost::filesystem::path> directories () const;
 
@@ -144,8 +144,28 @@ public:
 		return _content_kind;
 	}
 
+	dcp::Standard standard () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		DCPOMATIC_ASSERT (_standard);
+		return _standard.get ();
+	}
+
+	std::map<dcp::Marker, dcpomatic::ContentTime> markers () const {
+		return _markers;
+	}
+
 	bool kdm_timing_window_valid () const;
 
+	Resolution resolution () const;
+
+	std::vector<dcp::Rating> ratings () const {
+		return _ratings;
+	}
+
+	std::string content_version () const {
+		return _content_version;
+	}
+
 private:
 	friend class reels_test5;
 
@@ -153,7 +173,7 @@ private:
 
 	void read_directory (boost::filesystem::path);
 	void read_sub_directory (boost::filesystem::path);
-	std::list<DCPTimePeriod> reels (boost::shared_ptr<const Film> film) const;
+	std::list<dcpomatic::DCPTimePeriod> reels (boost::shared_ptr<const Film> film) const;
 	bool can_reference (
 		boost::shared_ptr<const Film> film,
 		boost::function <bool (boost::shared_ptr<const Content>)>,
@@ -192,6 +212,9 @@ private:
 	boost::optional<std::string> _cpl;
 	/** List of the lengths of the reels in this DCP */
 	std::list<int64_t> _reel_lengths;
+	std::map<dcp::Marker, dcpomatic::ContentTime> _markers;
+	std::vector<dcp::Rating> _ratings;
+	std::string _content_version;
 };
 
 #endif