X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=11096037c19eb651246b19ff91045b142a2308b7;hb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;hp=04352b269bb884e2a332187d90c70c357216dc9d;hpb=36774ee2b48f0bfde43b743592e5816ff58bb7d2;p=dcpomatic.git

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 04352b269..11096037c 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,8 +25,7 @@
  *  @brief DCPContent class.
  */
 
-#include "single_stream_audio_content.h"
-#include "subtitle_content.h"
+#include "content.h"
 #include <libcxml/cxml.h>
 #include <dcp/encrypted_kdm.h>
 
@@ -38,10 +38,12 @@ public:
 	static int const REFERENCE_SUBTITLE;
 };
 
+class ContentPart;
+
 /** @class DCPContent
  *  @brief An existing DCP used as input.
  */
-class DCPContent : public SingleStreamAudioContent, public SubtitleContent
+class DCPContent : public Content
 {
 public:
 	DCPContent (boost::shared_ptr<const Film>, boost::filesystem::path p);
@@ -60,26 +62,14 @@ public:
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *) const;
+	void as_xml (xmlpp::Node *, bool with_paths) const;
 	std::string identifier () const;
+	void use_template (boost::shared_ptr<const Content> c);
 
 	void set_default_colour_conversion ();
 	std::list<DCPTime> reel_split_points () const;
 
-	/* SubtitleContent */
-
-	bool has_text_subtitles () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _has_subtitles;
-	}
-
-	bool has_image_subtitles () const {
-		return false;
-	}
-
-	double subtitle_video_frame_rate () const;
-
-	boost::filesystem::path directory () const;
+	std::vector<boost::filesystem::path> directories () const;
 
 	bool encrypted () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -87,12 +77,15 @@ public:
 	}
 
 	void add_kdm (dcp::EncryptedKDM);
+	void add_ov (boost::filesystem::path ov);
 
 	boost::optional<dcp::EncryptedKDM> kdm () const {
 		return _kdm;
 	}
 
 	bool can_be_played () const;
+	bool needs_kdm () const;
+	bool needs_assets () const;
 
 	void set_reference_video (bool r);
 
@@ -121,20 +114,27 @@ public:
 
 	bool can_reference_subtitle (std::list<std::string> &) const;
 
-	boost::shared_ptr<VideoContent> video;
+	boost::optional<std::string> cpl () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _cpl;
+	}
 
-protected:
+private:
 	void add_properties (std::list<UserProperty>& p) const;
 
-private:
 	void read_directory (boost::filesystem::path);
 	std::list<DCPTimePeriod> reels () const;
-	template <class T> bool can_reference (std::string overlapping, std::list<std::string>& why_not) const;
+	bool can_reference (
+		boost::function <boost::shared_ptr<ContentPart> (boost::shared_ptr<const Content>)>,
+		std::string overlapping,
+		std::list<std::string>& why_not
+		) const;
 
 	std::string _name;
-	bool _has_subtitles;
 	/** true if our DCP is encrypted */
 	bool _encrypted;
+	/** true if this DCP needs more assets before it can be played */
+	bool _needs_assets;
 	boost::optional<dcp::EncryptedKDM> _kdm;
 	/** true if _kdm successfully decrypts the first frame of our DCP */
 	bool _kdm_valid;
@@ -150,6 +150,13 @@ private:
 	 *  rather than by rewrapping.
 	 */
 	bool _reference_subtitle;
+
+	boost::optional<dcp::Standard> _standard;
+	bool _three_d;
+	/** ID of the CPL to use; older metadata might not specify this: in that case
+	 *  just use the only CPL.
+	 */
+	boost::optional<std::string> _cpl;
 };
 
 #endif