X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=5a0559df2212dd28d1a65a062c637bb62673990f;hb=dd59755d86cdb1892bb0ba4d69af520cee4aa964;hp=da78e6d72a5cc0bd22f7f111c875013d41609ee3;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index da78e6d72..5a0559df2 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -24,12 +24,11 @@
  *  @brief DCPContent class.
  */
 
-#include <libcxml/cxml.h>
-#include <dcp/encrypted_kdm.h>
-#include <dcp/decrypted_kdm.h>
 #include "video_content.h"
 #include "single_stream_audio_content.h"
 #include "subtitle_content.h"
+#include <libcxml/cxml.h>
+#include <dcp/encrypted_kdm.h>
 
 class DCPContentProperty
 {
@@ -43,32 +42,36 @@ public:
 class DCPContent : public VideoContent, public SingleStreamAudioContent, public SubtitleContent
 {
 public:
-	DCPContent (boost::shared_ptr<const Film> f, boost::filesystem::path p);
-	DCPContent (boost::shared_ptr<const Film> f, cxml::ConstNodePtr, int version);
+	DCPContent (boost::shared_ptr<const Film>, boost::filesystem::path p);
+	DCPContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int version);
 
 	boost::shared_ptr<DCPContent> shared_from_this () {
 		return boost::dynamic_pointer_cast<DCPContent> (Content::shared_from_this ());
 	}
 
 	DCPTime full_length () const;
-	
+
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () const;
 	void as_xml (xmlpp::Node *) const;
 	std::string identifier () const;
 
+	void set_default_colour_conversion ();
+
 	/* SubtitleContent */
-	bool has_subtitles () const {
+
+	bool has_text_subtitles () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _has_subtitles;
 	}
-	
-	boost::filesystem::path directory () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _directory;
+
+	bool has_image_subtitles () const {
+		return false;
 	}
 
+	boost::filesystem::path directory () const;
+
 	bool encrypted () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _encrypted;
@@ -81,18 +84,47 @@ public:
 	}
 
 	bool can_be_played () const;
-	
+
+	bool reference_video () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _reference_video;
+	}
+
+	bool reference_audio () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _reference_audio;
+	}
+
+	bool reference_subtitle () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _reference_subtitle;
+	}
+
+protected:
+	void add_properties (std::list<std::pair<std::string, std::string> >& p) const;
+
 private:
 	void read_directory (boost::filesystem::path);
-	
+
 	std::string _name;
 	bool _has_subtitles;
 	/** true if our DCP is encrypted */
 	bool _encrypted;
-	boost::filesystem::path _directory;
 	boost::optional<dcp::EncryptedKDM> _kdm;
 	/** true if _kdm successfully decrypts the first frame of our DCP */
 	bool _kdm_valid;
+	/** true if the video in this DCP should be included in the output by reference
+	 *  rather than by rewrapping.
+	 */
+	bool _reference_video;
+	/** true if the audio in this DCP should be included in the output by reference
+	 *  rather than by rewrapping.
+	 */
+	bool _reference_audio;
+	/** true if the subtitle in this DCP should be included in the output by reference
+	 *  rather than by rewrapping.
+	 */
+	bool _reference_subtitle;
 };
 
 #endif