s/use_template/take_settings_from/g

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

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 1212b8b0fbf3ff79f3681d10b8c0fd6044b5b516..892b6aa735f7cb3fc589dc416400ede1defeab90 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -38,6 +38,7 @@ public:
        static int const REFERENCE_AUDIO;
        static int const REFERENCE_SUBTITLE;
        static int const NAME;
+       static int const HAS_SUBTITLES;
 };
 
 class ContentPart;
@@ -66,7 +67,7 @@ public:
        std::string technical_summary () const;
        void as_xml (xmlpp::Node *, bool with_paths) const;
        std::string identifier () const;
-       void use_template (boost::shared_ptr<const Content> c);
+       void take_settings_from (boost::shared_ptr<const Content> c);
 
        void set_default_colour_conversion ();
        std::list<DCPTime> reel_split_points () const;
@@ -123,6 +124,11 @@ public:
                return _cpl;
        }
 
+       std::string name () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _name;
+       }
+
 private:
        friend class reels_test5;
 
@@ -136,11 +142,6 @@ private:
                std::list<std::string>& why_not
                ) const;
 
-       std::string name () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _name;
-       }
-
        std::string _name;
        /** true if our DCP is encrypted */
        bool _encrypted;
@@ -168,6 +169,8 @@ private:
         *  just use the only CPL.
         */
        boost::optional<std::string> _cpl;
+       /** List of the lengths of the reels in this DCP */
+       std::list<int64_t> _reel_lengths;
 };
 
 #endif