summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-04-12 00:38:01 +0200
committerCarl Hetherington <cth@carlh.net>2021-04-12 01:22:10 +0200
commitee23803a3dced33ae93346dd1e5cb6453d873023 (patch)
tree85ac9d3f781d52228cf63468878ad166f429e5e6 /src
parent2fa5b7bfeb3826c20f2fe80f272b556d61935063 (diff)
Add some missing override statements.sub-rework
Diffstat (limited to 'src')
-rw-r--r--src/interop_subtitle_asset.h18
-rw-r--r--src/mono_picture_asset.h4
-rw-r--r--src/stereo_picture_asset.h4
3 files changed, 13 insertions, 13 deletions
diff --git a/src/interop_subtitle_asset.h b/src/interop_subtitle_asset.h
index f8df3c59..b953b303 100644
--- a/src/interop_subtitle_asset.h
+++ b/src/interop_subtitle_asset.h
@@ -66,19 +66,19 @@ public:
std::shared_ptr<const Asset>,
EqualityOptions,
NoteHandler note
- ) const;
+ ) const override;
- void write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const;
- void add_to_pkl (std::shared_ptr<PKL> pkl, boost::filesystem::path root) const;
+ void write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const override;
+ void add_to_pkl (std::shared_ptr<PKL> pkl, boost::filesystem::path root) const override;
- std::vector<std::shared_ptr<LoadFontNode>> load_font_nodes () const;
+ std::vector<std::shared_ptr<LoadFontNode>> load_font_nodes () const override;
- void add_font (std::string load_id, dcp::ArrayData data);
+ void add_font (std::string load_id, dcp::ArrayData data) override;
- std::string xml_as_string () const;
+ std::string xml_as_string () const override;
/** Write this content to an XML file with its fonts alongside */
- void write (boost::filesystem::path path) const;
+ void write (boost::filesystem::path path) const override;
void resolve_fonts (std::vector<std::shared_ptr<Asset>> assets);
void add_font_assets (std::vector<std::shared_ptr<Asset>>& assets);
@@ -121,7 +121,7 @@ public:
return _movie_title;
}
- int time_code_rate () const {
+ int time_code_rate () const override {
/* Interop can use either; just pick one */
return 1000;
}
@@ -132,7 +132,7 @@ public:
protected:
- std::string pkl_type (Standard s) const {
+ std::string pkl_type (Standard s) const override {
return static_pkl_type (s);
}
diff --git a/src/mono_picture_asset.h b/src/mono_picture_asset.h
index 505d3c20..7a37fa73 100644
--- a/src/mono_picture_asset.h
+++ b/src/mono_picture_asset.h
@@ -73,14 +73,14 @@ public:
* @path overwrite true to overwrite an existing file; for use when continuing a write which
* previously failed. If in doubt, use false here.
*/
- std::shared_ptr<PictureAssetWriter> start_write (boost::filesystem::path file, bool overwrite);
+ std::shared_ptr<PictureAssetWriter> start_write (boost::filesystem::path file, bool overwrite) override;
std::shared_ptr<MonoPictureAssetReader> start_read () const;
bool equals (
std::shared_ptr<const Asset> other,
EqualityOptions opt,
NoteHandler note
- ) const;
+ ) const override;
private:
std::string cpl_node_name () const;
diff --git a/src/stereo_picture_asset.h b/src/stereo_picture_asset.h
index 897ed4a4..a3365048 100644
--- a/src/stereo_picture_asset.h
+++ b/src/stereo_picture_asset.h
@@ -58,14 +58,14 @@ public:
explicit StereoPictureAsset (Fraction edit_rate, Standard standard);
/** Start a progressive write to a StereoPictureAsset */
- std::shared_ptr<PictureAssetWriter> start_write (boost::filesystem::path file, bool);
+ std::shared_ptr<PictureAssetWriter> start_write (boost::filesystem::path file, bool) override;
std::shared_ptr<StereoPictureAssetReader> start_read () const;
bool equals (
std::shared_ptr<const Asset> other,
EqualityOptions opt,
NoteHandler note
- ) const;
+ ) const override;
};