diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-04-09 13:58:27 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-04-09 13:58:27 +0200 |
| commit | b915348a8288d68e2ff114fb3dd89ad22e699969 (patch) | |
| tree | 46ce54a62bef93a544ada376d2c42ad4ab50f596 /src/lib | |
| parent | c80f7a440de73dead499764b4073d39d54c68b9f (diff) | |
Add some missing override labels.
Diffstat (limited to 'src/lib')
34 files changed, 130 insertions, 130 deletions
diff --git a/src/lib/analytics.h b/src/lib/analytics.h index c0a3e17ef..0de0b51ca 100644 --- a/src/lib/analytics.h +++ b/src/lib/analytics.h @@ -31,8 +31,8 @@ public: void successful_dcp_encode (); - void write () const; - void read (); + void write () const override; + void read () override; boost::signals2::signal<void (std::string, std::string)> Message; diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h index a2e06f11c..a8495aaa8 100644 --- a/src/lib/audio_decoder.h +++ b/src/lib/audio_decoder.h @@ -51,9 +51,9 @@ class AudioDecoder : public std::enable_shared_from_this<AudioDecoder>, public D public: AudioDecoder (Decoder* parent, std::shared_ptr<const AudioContent> content, bool fast); - boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film> film) const; + boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film> film) const override; void emit (std::shared_ptr<const Film> film, AudioStreamPtr stream, std::shared_ptr<const AudioBuffers>, dcpomatic::ContentTime, bool time_already_delayed = false); - void seek (); + void seek () override; void flush (); dcpomatic::ContentTime stream_position (std::shared_ptr<const Film> film, AudioStreamPtr stream) const; diff --git a/src/lib/check_content_change_job.h b/src/lib/check_content_change_job.h index b3cdf594c..a374e2a6f 100644 --- a/src/lib/check_content_change_job.h +++ b/src/lib/check_content_change_job.h @@ -30,7 +30,7 @@ public: CheckContentChangeJob (std::shared_ptr<const Film>); ~CheckContentChangeJob (); - std::string name () const; - std::string json_name () const; - void run (); + std::string name () const override; + std::string json_name () const override; + void run () override; }; diff --git a/src/lib/combine_dcp_job.h b/src/lib/combine_dcp_job.h index 4a7e02b8b..5311ddd3e 100644 --- a/src/lib/combine_dcp_job.h +++ b/src/lib/combine_dcp_job.h @@ -28,9 +28,9 @@ class CombineDCPJob : public Job public: CombineDCPJob (std::vector<boost::filesystem::path> inputs, boost::filesystem::path output, std::string annotation_text); - std::string name () const; - std::string json_name () const; - void run (); + std::string name () const override; + std::string json_name () const override; + void run () override; private: std::vector<boost::filesystem::path> _inputs; diff --git a/src/lib/config.h b/src/lib/config.h index 29f401755..e9b3ec203 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -1108,7 +1108,7 @@ public: static boost::signals2::signal<bool (BadReason)> Bad; - void write () const; + void write () const override; void write_config () const; void write_cinemas () const; void write_dkdm_recipients () const; @@ -1135,7 +1135,7 @@ public: private: Config (); - void read (); + void read () override; void set_defaults (); void set_kdm_email_to_default (); void set_notification_email_to_default (); diff --git a/src/lib/curl_uploader.h b/src/lib/curl_uploader.h index a3ef3cb22..564e77493 100644 --- a/src/lib/curl_uploader.h +++ b/src/lib/curl_uploader.h @@ -32,8 +32,8 @@ public: size_t read_callback (void* ptr, size_t size, size_t nmemb); protected: - virtual void create_directory (boost::filesystem::path directory); - virtual void upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size); + void create_directory (boost::filesystem::path directory) override; + void upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size) override; private: CURL* _curl; diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h index 40ed181fe..d57c0059c 100644 --- a/src/lib/dcp_content.h +++ b/src/lib/dcp_content.h @@ -65,18 +65,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; @@ -173,7 +173,7 @@ public: private: friend struct reels_test5; - 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; void read_directory (boost::filesystem::path); void read_sub_directory (boost::filesystem::path); 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/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h index 95e783d06..4a54aaf2e 100644 --- a/src/lib/dcp_subtitle_decoder.h +++ b/src/lib/dcp_subtitle_decoder.h @@ -32,10 +32,10 @@ class DCPSubtitleDecoder : public DCPSubtitle, public Decoder public: DCPSubtitleDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const DCPSubtitleContent>); - bool pass (); - void seek (dcpomatic::ContentTime time, bool accurate); + bool pass () override; + void seek (dcpomatic::ContentTime time, bool accurate) override; - std::vector<dcpomatic::FontData> fonts () const; + std::vector<dcpomatic::FontData> fonts () const override; private: dcpomatic::ContentTimePeriod content_time_period (std::shared_ptr<const dcp::Subtitle> s) const; diff --git a/src/lib/dkdm_recipient.h b/src/lib/dkdm_recipient.h index 50f2f3e15..6e9e4dfb1 100644 --- a/src/lib/dkdm_recipient.h +++ b/src/lib/dkdm_recipient.h @@ -47,7 +47,7 @@ public: explicit DKDMRecipient (cxml::ConstNodePtr); - void as_xml (xmlpp::Element *) const; + void as_xml (xmlpp::Element *) const override; std::list<std::string> emails; int utc_offset_hour; diff --git a/src/lib/dkdm_wrapper.h b/src/lib/dkdm_wrapper.h index 0c2992bc4..7227fdc86 100644 --- a/src/lib/dkdm_wrapper.h +++ b/src/lib/dkdm_wrapper.h @@ -61,8 +61,8 @@ public: : _dkdm (k) {} - std::string name () const; - void as_xml (xmlpp::Element *) const; + std::string name () const override; + void as_xml (xmlpp::Element *) const override; dcp::EncryptedKDM dkdm () const { return _dkdm; @@ -80,11 +80,11 @@ public: : _name (name) {} - std::string name () const { + std::string name () const override { return _name; } - void as_xml (xmlpp::Element *) const; + void as_xml (xmlpp::Element *) const override; std::list<std::shared_ptr<DKDMBase>> children () const { return _children; diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h index 0ca60f3f3..f93d66746 100644 --- a/src/lib/encode_server.h +++ b/src/lib/encode_server.h @@ -51,10 +51,10 @@ public: EncodeServer (bool verbose, int num_threads); ~EncodeServer (); - void run (); + void run () override; private: - void handle (std::shared_ptr<Socket>); + void handle (std::shared_ptr<Socket>) override; void worker_thread (); int process (std::shared_ptr<Socket> socket, struct timeval &, struct timeval &); void broadcast_thread (); diff --git a/src/lib/encoded_log_entry.h b/src/lib/encoded_log_entry.h index c4633dbe9..fadf48add 100644 --- a/src/lib/encoded_log_entry.h +++ b/src/lib/encoded_log_entry.h @@ -27,7 +27,7 @@ class EncodedLogEntry : public LogEntry public: EncodedLogEntry (int frame, std::string ip, double receive, double encode, double send); - std::string message () const; + std::string message () const override; private: int _frame; diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h index 9437942dc..601b28584 100644 --- a/src/lib/examine_content_job.h +++ b/src/lib/examine_content_job.h @@ -31,9 +31,9 @@ public: ExamineContentJob (std::shared_ptr<const Film>, std::shared_ptr<Content>); ~ExamineContentJob (); - std::string name () const; - std::string json_name () const; - void run (); + std::string name () const override; + std::string json_name () const override; + void run () override; std::shared_ptr<Content> content () const { return _content; diff --git a/src/lib/examine_ffmpeg_subtitles_job.h b/src/lib/examine_ffmpeg_subtitles_job.h index c9c0cabf4..1a065df57 100644 --- a/src/lib/examine_ffmpeg_subtitles_job.h +++ b/src/lib/examine_ffmpeg_subtitles_job.h @@ -29,9 +29,9 @@ public: ExamineFFmpegSubtitlesJob (std::shared_ptr<const Film>, std::shared_ptr<FFmpegContent>); ~ExamineFFmpegSubtitlesJob (); - std::string name () const; - std::string json_name () const; - void run (); + std::string name () const override; + std::string json_name () const override; + void run () override; private: std::shared_ptr<FFmpegContent> _content; 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/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h index 48317ed75..b2b0260b5 100644 --- a/src/lib/ffmpeg_image_proxy.h +++ b/src/lib/ffmpeg_image_proxy.h @@ -34,12 +34,12 @@ public: Result image ( Image::Alignment alignment, boost::optional<dcp::Size> size = boost::optional<dcp::Size> () - ) const; + ) const override; - void add_metadata (xmlpp::Node *) const; - void write_to_socket (std::shared_ptr<Socket>) const; - bool same (std::shared_ptr<const ImageProxy> other) const; - size_t memory_used () const; + void add_metadata (xmlpp::Node *) const override; + void write_to_socket (std::shared_ptr<Socket>) const override; + bool same (std::shared_ptr<const ImageProxy> other) const override; + size_t memory_used () const override; int avio_read (uint8_t* buffer, int const amount); int64_t avio_seek (int64_t const pos, int whence); diff --git a/src/lib/file_log.h b/src/lib/file_log.h index d7667f799..2795349ce 100644 --- a/src/lib/file_log.h +++ b/src/lib/file_log.h @@ -28,10 +28,10 @@ public: explicit FileLog (boost::filesystem::path file); FileLog (boost::filesystem::path file, int types); - std::string head_and_tail (int amount = 1024) const; + std::string head_and_tail (int amount = 1024) const override; private: - void do_log (std::shared_ptr<const LogEntry> entry); + void do_log (std::shared_ptr<const LogEntry> entry) override; /** filename to write to */ boost::filesystem::path _file; 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/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h index d925bef86..9666ea406 100644 --- a/src/lib/j2k_image_proxy.h +++ b/src/lib/j2k_image_proxy.h @@ -59,13 +59,13 @@ public: Result image ( Image::Alignment alignment, boost::optional<dcp::Size> size = boost::optional<dcp::Size> () - ) const; + ) const override; - void add_metadata (xmlpp::Node *) const; - void write_to_socket (std::shared_ptr<Socket>) const; + void add_metadata (xmlpp::Node *) const override; + void write_to_socket (std::shared_ptr<Socket> override) const override; /** @return true if our image is definitely the same as another, false if it is probably not */ - bool same (std::shared_ptr<const ImageProxy>) const; - int prepare (Image::Alignment alignment, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const; + bool same (std::shared_ptr<const ImageProxy>) const override; + int prepare (Image::Alignment alignment, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const override; std::shared_ptr<const dcp::Data> j2k () const { return _data; @@ -79,7 +79,7 @@ public: return _eye; } - size_t memory_used () const; + size_t memory_used () const override; private: std::shared_ptr<const dcp::Data> _data; diff --git a/src/lib/mid_side_decoder.h b/src/lib/mid_side_decoder.h index 99821caa4..857975478 100644 --- a/src/lib/mid_side_decoder.h +++ b/src/lib/mid_side_decoder.h @@ -25,11 +25,11 @@ class MidSideDecoder : public AudioProcessor { public: - std::string name () const; - std::string id () const; - int out_channels () const; - std::shared_ptr<AudioProcessor> clone (int) const; - std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels); - void make_audio_mapping_default (AudioMapping& mapping) const; - std::vector<NamedChannel> input_names () const; + std::string name () const override; + std::string id () const override; + int out_channels () const override; + std::shared_ptr<AudioProcessor> clone (int) const override; + std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels) override; + void make_audio_mapping_default (AudioMapping& mapping) const override; + std::vector<NamedChannel> input_names () const override; }; diff --git a/src/lib/null_log.h b/src/lib/null_log.h index ce6017ca2..2c7232f14 100644 --- a/src/lib/null_log.h +++ b/src/lib/null_log.h @@ -23,5 +23,5 @@ class NullLog : public Log { private: - void do_log (std::shared_ptr<const LogEntry>) {} + void do_log (std::shared_ptr<const LogEntry>) override {} }; diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h index c9885654b..1111b66c0 100644 --- a/src/lib/raw_image_proxy.h +++ b/src/lib/raw_image_proxy.h @@ -35,12 +35,12 @@ public: Result image ( Image::Alignment alignment, boost::optional<dcp::Size> size = boost::optional<dcp::Size> () - ) const; + ) const override; - void add_metadata (xmlpp::Node *) const; - void write_to_socket (std::shared_ptr<Socket>) const; - bool same (std::shared_ptr<const ImageProxy>) const; - size_t memory_used () const; + void add_metadata (xmlpp::Node *) const override; + void write_to_socket (std::shared_ptr<Socket>) const override; + bool same (std::shared_ptr<const ImageProxy>) const override; + size_t memory_used () const override; private: std::shared_ptr<Image> _image; diff --git a/src/lib/screen.h b/src/lib/screen.h index 6103d207d..84cecb80b 100644 --- a/src/lib/screen.h +++ b/src/lib/screen.h @@ -62,7 +62,7 @@ public: explicit Screen (cxml::ConstNodePtr); - void as_xml (xmlpp::Element *) const; + void as_xml (xmlpp::Element *) const override; std::vector<std::string> trusted_device_thumbprints () const; std::shared_ptr<Cinema> cinema; diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h index 2b010665c..76fb72b8a 100644 --- a/src/lib/send_kdm_email_job.h +++ b/src/lib/send_kdm_email_job.h @@ -53,9 +53,9 @@ public: ~SendKDMEmailJob (); - std::string name () const; - std::string json_name () const; - void run (); + std::string name () const override; + std::string json_name () const override; + void run () override; private: dcp::NameFormat _container_name_format; diff --git a/src/lib/stdout_log.h b/src/lib/stdout_log.h index 0dcc243db..2d5f30ee8 100644 --- a/src/lib/stdout_log.h +++ b/src/lib/stdout_log.h @@ -29,5 +29,5 @@ public: explicit StdoutLog (int types); private: - void do_log (std::shared_ptr<const LogEntry> entry); + void do_log (std::shared_ptr<const LogEntry> entry) override; }; diff --git a/src/lib/string_log_entry.h b/src/lib/string_log_entry.h index 143ada024..542a84646 100644 --- a/src/lib/string_log_entry.h +++ b/src/lib/string_log_entry.h @@ -28,7 +28,7 @@ class StringLogEntry : public LogEntry public: StringLogEntry (int type, std::string message); - std::string message () const { + std::string message () const override { return _message; } diff --git a/src/lib/string_text_file_content.h b/src/lib/string_text_file_content.h index ef908051c..9c7d4cea0 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; diff --git a/src/lib/string_text_file_decoder.h b/src/lib/string_text_file_decoder.h index aa8c80e6e..5887f34c6 100644 --- a/src/lib/string_text_file_decoder.h +++ b/src/lib/string_text_file_decoder.h @@ -31,10 +31,10 @@ class StringTextFileDecoder : public Decoder, public StringTextFile public: StringTextFileDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const StringTextFileContent>); - void seek (dcpomatic::ContentTime time, bool accurate); - bool pass (); + void seek (dcpomatic::ContentTime time, bool accurate) override; + bool pass () override; - std::vector<dcpomatic::FontData> fonts () const; + std::vector<dcpomatic::FontData> fonts () const override; private: dcpomatic::ContentTimePeriod content_time_period (sub::Subtitle s) const; diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h index d1355afb0..39d6e828d 100644 --- a/src/lib/text_decoder.h +++ b/src/lib/text_decoder.h @@ -48,7 +48,7 @@ public: dcpomatic::ContentTime first ); - boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const { + boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override { return _position; } @@ -60,7 +60,7 @@ public: void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle); void emit_stop (dcpomatic::ContentTime to); - void seek (); + void seek () override; std::shared_ptr<const TextContent> content () const { return _content; diff --git a/src/lib/upload_job.h b/src/lib/upload_job.h index afd5ebda4..a3da164bf 100644 --- a/src/lib/upload_job.h +++ b/src/lib/upload_job.h @@ -33,10 +33,10 @@ public: explicit UploadJob (std::shared_ptr<const Film>); ~UploadJob (); - std::string name () const; - std::string json_name () const; - void run (); - std::string status () const; + std::string name () const override; + std::string json_name () const override; + void run () override; + std::string status () const override; private: void set_status (std::string); diff --git a/src/lib/upmixer_a.h b/src/lib/upmixer_a.h index b357616ef..9e364dcc9 100644 --- a/src/lib/upmixer_a.h +++ b/src/lib/upmixer_a.h @@ -36,14 +36,14 @@ class UpmixerA : public AudioProcessor public: explicit UpmixerA (int sampling_rate); - std::string name () const; - std::string id () const; - int out_channels () const; - std::shared_ptr<AudioProcessor> clone (int) const; - std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels); - void flush (); - void make_audio_mapping_default (AudioMapping& mapping) const; - std::vector<NamedChannel> input_names () const; + std::string name () const override; + std::string id () const override; + int out_channels () const override; + std::shared_ptr<AudioProcessor> clone (int) const override; + std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels) override; + void flush () override; + void make_audio_mapping_default (AudioMapping& mapping) const override; + std::vector<NamedChannel> input_names () const override; private: BandPassAudioFilter _left; diff --git a/src/lib/upmixer_b.h b/src/lib/upmixer_b.h index fc30e2a28..611ed6a90 100644 --- a/src/lib/upmixer_b.h +++ b/src/lib/upmixer_b.h @@ -34,14 +34,14 @@ class UpmixerB : public AudioProcessor public: explicit UpmixerB (int sampling_rate); - std::string name () const; - std::string id () const; - int out_channels () const; - std::shared_ptr<AudioProcessor> clone (int) const; - std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels); - void flush (); - void make_audio_mapping_default (AudioMapping& mapping) const; - std::vector<NamedChannel> input_names () const; + std::string name () const override; + std::string id () const override; + int out_channels () const override; + std::shared_ptr<AudioProcessor> clone (int) const override; + std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels) override; + void flush () override; + void make_audio_mapping_default (AudioMapping& mapping) const override; + std::vector<NamedChannel> input_names () const override; private: LowPassAudioFilter _lfe; diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 9d69f743a..828ac66a2 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -56,11 +56,11 @@ public: friend struct ffmpeg_pts_offset_test; friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length); - boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const { + boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override { return _position; } - void seek (); + void seek () override; void emit (std::shared_ptr<const Film> film, std::shared_ptr<const ImageProxy>, Frame frame); boost::signals2::signal<void (ContentVideo)> Data; |
