Emit no audio from DCPs if none is mapped

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

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index b51e7ae7a8e53d69cf406a05f2956599e5a22f89..04fa31ea4281c611e16ed237616aff749d76e328 100644 (file)
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -48,10 +48,8 @@ public:
                return _video_frame_rate;
        }
 
-       dcp::Size video_size () const override {
-               DCPOMATIC_ASSERT (_has_video);
-               DCPOMATIC_ASSERT (_video_size);
-               return *_video_size;
+       boost::optional<dcp::Size> video_size() const override {
+               return _video_size;
        }
 
        Frame video_length () const override {
@@ -90,6 +88,10 @@ public:
                return _audio_channels.get_value_or (0);
        }
 
+       int active_audio_channels() const {
+               return _active_audio_channels.get_value_or(0);
+       }
+
        Frame audio_length () const override {
                return _audio_length;
        }
@@ -169,16 +171,14 @@ public:
                return _atmos_edit_rate;
        }
 
-       /** @return fonts in each reel */
-       std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> fonts() const {
-               return _fonts;
-       }
+       void add_fonts(std::shared_ptr<TextContent> content);
 
 private:
        boost::optional<double> _video_frame_rate;
        boost::optional<dcp::Size> _video_size;
        Frame _video_length = 0;
        boost::optional<int> _audio_channels;
+       boost::optional<int> _active_audio_channels;
        boost::optional<int> _audio_frame_rate;
        Frame _audio_length = 0;
        std::string _name;
@@ -206,5 +206,19 @@ private:
        bool _has_atmos = false;
        Frame _atmos_length = 0;
        dcp::Fraction _atmos_edit_rate;
-       std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> _fonts;
+
+       struct Font
+       {
+               Font(int reel_index_, std::string asset_id_, std::shared_ptr<dcpomatic::Font> font_)
+                       : reel_index(reel_index_)
+                       , asset_id(asset_id_)
+                       , font(font_)
+               {}
+
+               int reel_index;
+               std::string asset_id;
+               std::shared_ptr<dcpomatic::Font> font;
+       };
+
+       std::vector<Font> _fonts;
 };