Fix analysis of audio when the subject is later in the playlist than

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

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 74f06cdc640adaa8a7337becaf1bb31ae5508534..410953eb70082c5f25f67744cd87c208fee9bb7a 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -29,7 +29,6 @@
 #include "subtitle_content.h"
 #include <libcxml/cxml.h>
 #include <dcp/encrypted_kdm.h>
-#include <dcp/decrypted_kdm.h>
 
 class DCPContentProperty
 {
@@ -51,19 +50,26 @@ public:
        }
 
        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;
        }
-       
+
+       bool has_image_subtitles () const {
+               return false;
+       }
+
        boost::filesystem::path directory () const;
 
        bool encrypted () const {
@@ -78,10 +84,13 @@ public:
        }
 
        bool can_be_played () const;
-       
+
+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 */