diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-05-06 10:35:44 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-05-07 09:29:58 +0200 |
| commit | a460ac98a12afb2cb51aab073bb4fe1a073e8c55 (patch) | |
| tree | e9def4b2391128c856dda6ec282d380631cf0ff9 | |
| parent | 67901f7d46fdaf60d1781556a3a6a781ec5acd51 (diff) | |
Add some missing overrides.
| -rw-r--r-- | src/lib/dcp_content.h | 18 | ||||
| -rw-r--r-- | src/lib/dcp_subtitle_content.h | 12 | ||||
| -rw-r--r-- | src/lib/ffmpeg_content.h | 18 | ||||
| -rw-r--r-- | src/lib/image_content.h | 16 | ||||
| -rw-r--r-- | src/lib/string_text_file_content.h | 14 |
5 files changed, 39 insertions, 39 deletions
diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h index 69520fbd6..c9b18037a 100644 --- a/src/lib/dcp_content.h +++ b/src/lib/dcp_content.h @@ -61,18 +61,18 @@ public: return std::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ()); } - dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const; - dcpomatic::DCPTime approximate_length () const; + dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override; + dcpomatic::DCPTime approximate_length () const override; - void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>); - std::string summary () const; - std::string technical_summary () const; - void as_xml (xmlpp::Node *, bool with_paths) const; - std::string identifier () const; - void take_settings_from (std::shared_ptr<const Content> c); + void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override; + std::string summary () const override; + std::string technical_summary () const override; + void as_xml (xmlpp::Node *, bool with_paths) const override; + std::string identifier () const override; + void take_settings_from (std::shared_ptr<const Content> c) override; void set_default_colour_conversion (); - std::list<dcpomatic::DCPTime> reel_split_points (std::shared_ptr<const Film> film) const; + std::list<dcpomatic::DCPTime> reel_split_points (std::shared_ptr<const Film> film) const override; std::vector<boost::filesystem::path> directories () const; diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h index f4a767d21..5949f8b0b 100644 --- a/src/lib/dcp_subtitle_content.h +++ b/src/lib/dcp_subtitle_content.h @@ -27,12 +27,12 @@ public: DCPSubtitleContent (boost::filesystem::path); DCPSubtitleContent (cxml::ConstNodePtr, int); - void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>); - 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; + 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; private: dcpomatic::ContentTime _length; diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index df7b56edc..ce4a8aa69 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -59,15 +59,15 @@ 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 (); @@ -100,7 +100,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; diff --git a/src/lib/image_content.h b/src/lib/image_content.h index 81396c63b..d817eeee8 100644 --- a/src/lib/image_content.h +++ b/src/lib/image_content.h @@ -37,21 +37,21 @@ public: return std::dynamic_pointer_cast<const ImageContent> (Content::shared_from_this ()); }; - void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>); - 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; + 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 (); bool still () const; private: - void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty>& p) const; + void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty>& p) const override; boost::optional<boost::filesystem::path> _path_to_scan; }; diff --git a/src/lib/string_text_file_content.h b/src/lib/string_text_file_content.h index aec86181c..f9356cc6f 100644 --- a/src/lib/string_text_file_content.h +++ b/src/lib/string_text_file_content.h @@ -42,13 +42,13 @@ public: return std::dynamic_pointer_cast<const StringTextFileContent> (Content::shared_from_this ()); } - void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>); - 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; - std::string identifier () const; + void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) 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 override; private: dcpomatic::ContentTime _length; |
