Fix font handling for DCP subtitles.

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

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 3fedaca06aded36f75f4beacd85de8ef2fd954ee..ac43805977c98f75d5cc9eea1a0c6e94a8871c64 100644 (file)
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -18,50 +18,58 @@
 
 */
 
+
 /** @file  src/lib/dcp_examiner.h
  *  @brief DCPExaminer class.
  */
 
-#include "video_examiner.h"
+
 #include "audio_examiner.h"
-#include "dcp.h"
 #include "dcp_text_track.h"
 #include "dcpomatic_assert.h"
+#include "video_examiner.h"
 #include <dcp/dcp_time.h>
+#include <dcp/rating.h>
+
 
 class DCPContent;
 
-class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
+
+class DCPExaminer : public VideoExaminer, public AudioExaminer
 {
 public:
        explicit DCPExaminer (std::shared_ptr<const DCPContent>, bool tolerant);
 
-       bool has_video () const {
+       bool has_video () const override {
                return _has_video;
        }
 
-       boost::optional<double> video_frame_rate () const {
+       boost::optional<double> video_frame_rate () const override {
                return _video_frame_rate;
        }
 
-       dcp::Size video_size () const {
+       dcp::Size video_size () const override {
                DCPOMATIC_ASSERT (_has_video);
                DCPOMATIC_ASSERT (_video_size);
                return *_video_size;
        }
 
-       Frame video_length () const {
+       Frame video_length () const override {
                return _video_length;
        }
 
-       bool yuv () const {
+       bool yuv () const override {
                return false;
        }
 
-       VideoRange range () const {
+       VideoRange range () const override {
                return VideoRange::FULL;
        }
 
+       PixelQuanta pixel_quanta () const override {
+               return {};
+       }
+
        std::string name () const {
                return _name;
        }
@@ -74,22 +82,26 @@ public:
                return _needs_assets;
        }
 
-       bool has_audio () const {
+       bool has_audio () const override {
                return _has_audio;
        }
 
-       int audio_channels () const {
+       int audio_channels () const override {
                return _audio_channels.get_value_or (0);
        }
 
-       Frame audio_length () const {
+       Frame audio_length () const override {
                return _audio_length;
        }
 
-       int audio_frame_rate () const {
+       int audio_frame_rate () const override {
                return _audio_frame_rate.get_value_or (48000);
        }
 
+       boost::optional<dcp::LanguageTag> audio_language () const {
+               return _audio_language;
+       }
+
        /** @param type TEXT_OPEN_SUBTITLE or TEXT_CLOSED_CAPTION.
         *  @return Number of assets of this type in this DCP.
         */
@@ -97,6 +109,10 @@ public:
                return _text_count[static_cast<int>(type)];
        }
 
+       boost::optional<dcp::LanguageTag> open_subtitle_language () const {
+               return _open_subtitle_language;
+       }
+
        DCPTextTrack dcp_text_track (int i) const {
                DCPOMATIC_ASSERT (i >= 0 && i < static_cast<int>(_dcp_text_tracks.size()));
                return _dcp_text_tracks[i];
@@ -150,6 +166,11 @@ public:
                return _atmos_edit_rate;
        }
 
+       /** @return fonts in each reel */
+       std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> fonts() const {
+               return _fonts;
+       }
+
 private:
        boost::optional<double> _video_frame_rate;
        boost::optional<dcp::Size> _video_size;
@@ -162,8 +183,10 @@ private:
        bool _has_video = false;
        /** true if this DCP has audio content (but false if it has unresolved references to audio content) */
        bool _has_audio = false;
+       boost::optional<dcp::LanguageTag> _audio_language;
        /** number of different assets of each type (OCAP/CCAP) */
        int _text_count[static_cast<int>(TextType::COUNT)];
+       boost::optional<dcp::LanguageTag> _open_subtitle_language;
        /** the DCPTextTracks for each of our CCAPs */
        std::vector<DCPTextTrack> _dcp_text_tracks;
        bool _encrypted = false;
@@ -180,4 +203,5 @@ private:
        bool _has_atmos = false;
        Frame _atmos_length = 0;
        dcp::Fraction _atmos_edit_rate;
+       std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> _fonts;
 };