Try to fix some warnings.

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

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 9d6faa7e8d49ca230c55a0d7b179d6bc7f6d1a7d..f54f02c36c005f607de6b8b3720beac8b4a3f2df 100644 (file)
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -59,10 +59,6 @@ public:
                return _name;
        }
 
-       bool has_subtitles () const {
-               return _has_subtitles;
-       }
-
        bool encrypted () const {
                return _encrypted;
        }
@@ -87,6 +83,10 @@ public:
                return _audio_frame_rate.get_value_or (48000);
        }
 
+       bool has_text (TextType type) const {
+               return _has_text[type];
+       }
+
        bool kdm_valid () const {
                return _kdm_valid;
        }
@@ -99,6 +99,10 @@ public:
                return _three_d;
        }
 
+       dcp::ContentKind content_kind () const {
+               return _content_kind;
+       }
+
        std::string cpl () const {
                return _cpl;
        }
@@ -115,16 +119,17 @@ private:
        boost::optional<int> _audio_frame_rate;
        Frame _audio_length;
        std::string _name;
-       bool _has_subtitles;
-       bool _encrypted;
        /** true if this DCP has video content (but false if it has unresolved references to video content) */
        bool _has_video;
        /** true if this DCP has audio content (but false if it has unresolved references to audio content) */
        bool _has_audio;
+       bool _has_text[TEXT_COUNT];
+       bool _encrypted;
        bool _needs_assets;
        bool _kdm_valid;
        boost::optional<dcp::Standard> _standard;
        bool _three_d;
+       dcp::ContentKind _content_kind;
        std::string _cpl;
        std::list<int64_t> _reel_lengths;
 };