Fix incorrect container size when loading a VF/OV combination into the player.

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

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index aaeec6d3249c6405bee61bda579527ddbf367105..9d6faa7e8d49ca230c55a0d7b179d6bc7f6d1a7d 100644 (file)
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -33,12 +33,18 @@ class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
 public:
        explicit DCPExaminer (boost::shared_ptr<const DCPContent>);
 
+       bool has_video () const {
+               return _has_video;
+       }
+
        boost::optional<double> video_frame_rate () const {
                return _video_frame_rate;
        }
 
        dcp::Size video_size () const {
-               return _video_size.get_value_or (dcp::Size (1998, 1080));
+               DCPOMATIC_ASSERT (_has_video);
+               DCPOMATIC_ASSERT (_video_size);
+               return *_video_size;
        }
 
        Frame video_length () const {
@@ -65,6 +71,10 @@ public:
                return _needs_assets;
        }
 
+       bool has_audio () const {
+               return _has_audio;
+       }
+
        int audio_channels () const {
                return _audio_channels.get_value_or (0);
        }
@@ -107,6 +117,10 @@ private:
        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 _needs_assets;
        bool _kdm_valid;
        boost::optional<dcp::Standard> _standard;