Fix write_frame_info again.

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

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index da78e6d72a5cc0bd22f7f111c875013d41609ee3..d7a29c6ed97c49f89ea0207730c92c10d2d59a8f 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -24,12 +24,12 @@
  *  @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>
+#include <dcp/decrypted_kdm.h>
 
 class DCPContentProperty
 {
@@ -43,15 +43,15 @@ 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;
@@ -59,16 +59,18 @@ public:
        std::string identifier () const;
 
        /* 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,15 +83,17 @@ 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 */
        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;