More automated renaming.

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

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 892b6aa735f7cb3fc589dc416400ede1defeab90..fedc43d6417f90c978281ee18b36c931d42ff558 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -36,9 +36,9 @@ public:
        static int const NEEDS_ASSETS;
        static int const REFERENCE_VIDEO;
        static int const REFERENCE_AUDIO;
-       static int const REFERENCE_SUBTITLE;
+       static int const REFERENCE_CAPTION;
        static int const NAME;
-       static int const HAS_SUBTITLES;
+       static int const CAPTIONS;
 };
 
 class ContentPart;
@@ -97,7 +97,7 @@ public:
                return _reference_video;
        }
 
-       bool can_reference_video (std::list<std::string> &) const;
+       bool can_reference_video (std::string &) const;
 
        void set_reference_audio (bool r);
 
@@ -106,16 +106,19 @@ public:
                return _reference_audio;
        }
 
-       bool can_reference_audio (std::list<std::string> &) const;
+       bool can_reference_audio (std::string &) const;
 
-       void set_reference_subtitle (bool r);
+       void set_reference_caption (TextType type, bool r);
 
-       bool reference_subtitle () const {
+       /** @param type Original type of captions in the DCP.
+        *  @return true if these captions are to be referenced.
+        */
+       bool reference_caption (TextType type) const {
                boost::mutex::scoped_lock lm (_mutex);
-               return _reference_subtitle;
+               return _reference_caption[type];
        }
 
-       bool can_reference_subtitle (std::list<std::string> &) const;
+       bool can_reference_caption (TextType type, std::string &) const;
 
        void set_cpl (std::string id);
 
@@ -129,6 +132,11 @@ public:
                return _name;
        }
 
+       bool three_d () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _three_d;
+       }
+
 private:
        friend class reels_test5;
 
@@ -137,9 +145,9 @@ private:
        void read_directory (boost::filesystem::path);
        std::list<DCPTimePeriod> reels () const;
        bool can_reference (
-               boost::function <boost::shared_ptr<ContentPart> (boost::shared_ptr<const Content>)>,
+               boost::function <bool (boost::shared_ptr<const Content>)>,
                std::string overlapping,
-               std::list<std::string>& why_not
+               std::string& why_not
                ) const;
 
        std::string _name;
@@ -158,10 +166,11 @@ private:
         *  rather than by rewrapping.
         */
        bool _reference_audio;
-       /** true if the subtitle in this DCP should be included in the output by reference
-        *  rather than by rewrapping.
+       /** true if the captions in this DCP should be included in the output by reference
+        *  rather than by rewrapping.  The types here are the original caption types,
+        *  not what they are being used for.
         */
-       bool _reference_subtitle;
+       bool _reference_caption[CAPTION_COUNT];
 
        boost::optional<dcp::Standard> _standard;
        bool _three_d;