X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=255cfa19a1e864ae0364d0d8a6bd4db208487f00;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=f4445ad53045cb5d733017b7e5ae3519cf6f2ad2;hpb=3ef438f90729d78ad579bbeb7933b3cf4f09c10c;p=dcpomatic.git

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index f4445ad53..255cfa19a 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);
@@ -66,21 +68,6 @@ public:
 	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 {
-		return video_frame_rate ();
-	}
-
 	boost::filesystem::path directory () const;
 
 	bool encrypted () const {
@@ -123,16 +110,18 @@ public:
 
 	bool can_reference_subtitle (std::list<std::string> &) const;
 
-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;
 	boost::optional<dcp::EncryptedKDM> _kdm;
@@ -150,6 +139,8 @@ private:
 	 *  rather than by rewrapping.
 	 */
 	bool _reference_subtitle;
+
+	boost::optional<dcp::Standard> _standard;
 };
 
 #endif