Emit no audio from DCPs if none is mapped

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index df7b56edca41e9ecd5475c2f0a9658f1a1b855e5..a86358b7677ec46eb07f143585c1cfccf2788647 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -18,22 +18,28 @@
 
 */
 
+
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#include "content.h"
+
 #include "audio_stream.h"
+#include "content.h"
+#include "filter.h"
+
 
 struct AVFormatContext;
 struct AVStream;
 
-class Filter;
-class FFmpegSubtitleStream;
+
 class FFmpegAudioStream;
+class FFmpegSubtitleStream;
+class Filter;
 class VideoContent;
 struct ffmpeg_pts_offset_test;
 struct audio_sampling_rate_test;
 
+
 class FFmpegContentProperty
 {
 public:
@@ -44,6 +50,7 @@ public:
        static int const KDM;
 };
 
+
 class FFmpegContent : public Content
 {
 public:
@@ -59,19 +66,19 @@ public:
                return std::dynamic_pointer_cast<const FFmpegContent> (Content::shared_from_this ());
        }
 
-       void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>);
-       void take_settings_from (std::shared_ptr<const Content> c);
-       std::string summary () const;
-       std::string technical_summary () const;
-       void as_xml (xmlpp::Node *, bool with_paths) const;
-       dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
-       dcpomatic::DCPTime approximate_length () const;
+       void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override;
+       void take_settings_from (std::shared_ptr<const Content> c) override;
+       std::string summary () const override;
+       std::string technical_summary () const override;
+       void as_xml (xmlpp::Node *, bool with_paths) const override;
+       dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override;
+       dcpomatic::DCPTime approximate_length () const override;
 
-       std::string identifier () const;
+       std::string identifier () const override;
 
        void set_default_colour_conversion ();
 
-       void set_filters (std::vector<Filter const *> const &);
+       void set_filters(std::vector<Filter> const&);
 
        std::vector<std::shared_ptr<FFmpegSubtitleStream>> subtitle_streams () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -85,7 +92,7 @@ public:
 
        std::vector<std::shared_ptr<FFmpegAudioStream>> ffmpeg_audio_streams () const;
 
-       std::vector<Filter const *> filters () const {
+       std::vector<Filter> filters() const {
                boost::mutex::scoped_lock lm (_mutex);
                return _filters;
        }
@@ -100,7 +107,7 @@ public:
        void signal_subtitle_stream_changed ();
 
 private:
-       void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const;
+       void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const override;
 
        friend struct ffmpeg_pts_offset_test;
        friend struct audio_sampling_rate_test;
@@ -109,7 +116,7 @@ private:
        std::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
        boost::optional<dcpomatic::ContentTime> _first_video;
        /** Video filters that should be used when generating DCPs */
-       std::vector<Filter const *> _filters;
+       std::vector<Filter> _filters;
 
        boost::optional<AVColorRange> _color_range;
        boost::optional<AVColorPrimaries> _color_primaries;