More of previous.

[dcpomatic.git] / src / lib / dcp_content.h

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 78c97bec513026d3470640ea01b1c02075693a13..489151e03cb912c50afaab1a719b3415c2979559 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,9 +24,7 @@
  *  @brief DCPContent class.
  */
 
-#include "video_content.h"
-#include "single_stream_audio_content.h"
-#include "subtitle_content.h"
+#include "content.h"
 #include <libcxml/cxml.h>
 #include <dcp/encrypted_kdm.h>
 
@@ -39,10 +37,12 @@ public:
        static int const REFERENCE_SUBTITLE;
 };
 
+class ContentPart;
+
 /** @class DCPContent
  *  @brief An existing DCP used as input.
  */
-class DCPContent : public VideoContent, public SingleStreamAudioContent, public SubtitleContent
+class DCPContent : public Content
 {
 public:
        DCPContent (boost::shared_ptr<const Film>, boost::filesystem::path p);
@@ -67,21 +67,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 {
@@ -124,16 +109,18 @@ public:
 
        bool can_reference_subtitle (std::list<std::string> &) const;
 
-protected:
-       void add_properties (std::list<std::pair<std::string, std::string> >& p) const;
-
 private:
+       void add_properties (std::list<UserProperty>& p) const;
+
        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;