summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-06-28 22:59:41 +0200
committerCarl Hetherington <cth@carlh.net>2024-08-17 12:57:31 +0200
commit54b46b7630c06044a121d70d9035384126f6e7b3 (patch)
tree916bd20c307e744787b9fe215a96fae9fdee6e7d /src
parenta5adc9221d0af15f345cd3dbc76f37ee47fe65d5 (diff)
Cleanup: remove unused parameter.
Diffstat (limited to 'src')
-rw-r--r--src/reel_asset.cc4
-rw-r--r--src/reel_asset.h2
-rw-r--r--src/reel_atmos_asset.cc2
-rw-r--r--src/reel_atmos_asset.h2
-rw-r--r--src/reel_interop_text_asset.cc2
-rw-r--r--src/reel_interop_text_asset.h2
-rw-r--r--src/reel_markers_asset.cc2
-rw-r--r--src/reel_markers_asset.h2
-rw-r--r--src/reel_mono_picture_asset.cc2
-rw-r--r--src/reel_mono_picture_asset.h2
-rw-r--r--src/reel_smpte_text_asset.cc2
-rw-r--r--src/reel_smpte_text_asset.h2
-rw-r--r--src/reel_sound_asset.cc2
-rw-r--r--src/reel_sound_asset.h2
-rw-r--r--src/reel_stereo_picture_asset.cc2
-rw-r--r--src/reel_stereo_picture_asset.h2
16 files changed, 17 insertions, 17 deletions
diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index c782cf2b..1d3d1d1f 100644
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -87,7 +87,7 @@ ReelAsset::ReelAsset (shared_ptr<const cxml::Node> node)
xmlpp::Element*
ReelAsset::write_to_cpl(xmlpp::Element* node, Standard standard) const
{
- auto a = cxml::add_child(node, cpl_node_name(standard));
+ auto a = cxml::add_child(node, cpl_node_name());
auto const attr = cpl_node_attribute (standard);
if (!attr.first.empty ()) {
a->set_attribute (attr.first, attr.second);
@@ -138,7 +138,7 @@ optional_to_string (optional<T> o)
bool
ReelAsset::asset_equals(shared_ptr<const ReelAsset> other, EqualityOptions const& opt, NoteHandler note) const
{
- auto const node = cpl_node_name(Standard::SMPTE);
+ auto const node = cpl_node_name();
if (_annotation_text != other->_annotation_text) {
string const s = String::compose("Reel %1: annotation texts differ (%2 vs %3)", node, optional_to_string(_annotation_text), optional_to_string(other->_annotation_text));
diff --git a/src/reel_asset.h b/src/reel_asset.h
index 8dad739e..99db60b4 100644
--- a/src/reel_asset.h
+++ b/src/reel_asset.h
@@ -139,7 +139,7 @@ protected:
/** @return the node name that this asset uses in the CPL's &lt;Reel&gt; node
* e.g. MainPicture, MainSound etc.
*/
- virtual std::string cpl_node_name (Standard) const = 0;
+ virtual std::string cpl_node_name() const = 0;
/** @return Any attribute that should be used on the asset's node in the CPL */
virtual std::pair<std::string, std::string> cpl_node_attribute (Standard) const;
diff --git a/src/reel_atmos_asset.cc b/src/reel_atmos_asset.cc
index c2cdb7f3..fcecb548 100644
--- a/src/reel_atmos_asset.cc
+++ b/src/reel_atmos_asset.cc
@@ -69,7 +69,7 @@ ReelAtmosAsset::ReelAtmosAsset (std::shared_ptr<const cxml::Node> node)
string
-ReelAtmosAsset::cpl_node_name (Standard) const
+ReelAtmosAsset::cpl_node_name() const
{
return "axd:AuxData";
}
diff --git a/src/reel_atmos_asset.h b/src/reel_atmos_asset.h
index c3de76a8..ab18d1ab 100644
--- a/src/reel_atmos_asset.h
+++ b/src/reel_atmos_asset.h
@@ -76,7 +76,7 @@ private:
return std::string("MDEK");
}
- std::string cpl_node_name (Standard standard) const override;
+ std::string cpl_node_name() const override;
std::pair<std::string, std::string> cpl_node_namespace () const override;
};
diff --git a/src/reel_interop_text_asset.cc b/src/reel_interop_text_asset.cc
index 62211b6d..4e0f45c8 100644
--- a/src/reel_interop_text_asset.cc
+++ b/src/reel_interop_text_asset.cc
@@ -67,7 +67,7 @@ ReelInteropTextAsset::ReelInteropTextAsset(std::shared_ptr<const cxml::Node> nod
string
-ReelInteropTextAsset::cpl_node_name(Standard) const
+ReelInteropTextAsset::cpl_node_name() const
{
switch (_type) {
case TextType::SUBTITLE:
diff --git a/src/reel_interop_text_asset.h b/src/reel_interop_text_asset.h
index 428f0fd5..4c0648e4 100644
--- a/src/reel_interop_text_asset.h
+++ b/src/reel_interop_text_asset.h
@@ -64,7 +64,7 @@ public:
xmlpp::Element* write_to_cpl(xmlpp::Element* node, Standard standard) const override;
protected:
- std::string cpl_node_name (Standard standard) const override;
+ std::string cpl_node_name() const override;
std::pair<std::string, std::string> cpl_node_namespace() const override;
};
diff --git a/src/reel_markers_asset.cc b/src/reel_markers_asset.cc
index 4b1b3472..df920f44 100644
--- a/src/reel_markers_asset.cc
+++ b/src/reel_markers_asset.cc
@@ -73,7 +73,7 @@ ReelMarkersAsset::ReelMarkersAsset (cxml::ConstNodePtr node)
string
-ReelMarkersAsset::cpl_node_name (Standard) const
+ReelMarkersAsset::cpl_node_name() const
{
return "MainMarkers";
}
diff --git a/src/reel_markers_asset.h b/src/reel_markers_asset.h
index e2b65585..059c0c1f 100644
--- a/src/reel_markers_asset.h
+++ b/src/reel_markers_asset.h
@@ -62,7 +62,7 @@ public:
}
protected:
- std::string cpl_node_name (Standard) const override;
+ std::string cpl_node_name() const override;
private:
std::map<Marker, Time> _markers;
diff --git a/src/reel_mono_picture_asset.cc b/src/reel_mono_picture_asset.cc
index 81eb4df9..5dbf85d2 100644
--- a/src/reel_mono_picture_asset.cc
+++ b/src/reel_mono_picture_asset.cc
@@ -62,7 +62,7 @@ ReelMonoPictureAsset::ReelMonoPictureAsset (std::shared_ptr<const cxml::Node> no
string
-ReelMonoPictureAsset::cpl_node_name (Standard) const
+ReelMonoPictureAsset::cpl_node_name() const
{
return "MainPicture";
}
diff --git a/src/reel_mono_picture_asset.h b/src/reel_mono_picture_asset.h
index 13c6545e..0c468e0e 100644
--- a/src/reel_mono_picture_asset.h
+++ b/src/reel_mono_picture_asset.h
@@ -82,7 +82,7 @@ public:
}
private:
- std::string cpl_node_name (Standard standard) const override;
+ std::string cpl_node_name() const override;
};
diff --git a/src/reel_smpte_text_asset.cc b/src/reel_smpte_text_asset.cc
index 48694651..76efab44 100644
--- a/src/reel_smpte_text_asset.cc
+++ b/src/reel_smpte_text_asset.cc
@@ -69,7 +69,7 @@ ReelSMPTETextAsset::ReelSMPTETextAsset(shared_ptr<const cxml::Node> node)
string
-ReelSMPTETextAsset::cpl_node_name(Standard) const
+ReelSMPTETextAsset::cpl_node_name() const
{
switch (_type) {
case TextType::SUBTITLE:
diff --git a/src/reel_smpte_text_asset.h b/src/reel_smpte_text_asset.h
index 9a1c78a9..b3c2f655 100644
--- a/src/reel_smpte_text_asset.h
+++ b/src/reel_smpte_text_asset.h
@@ -67,7 +67,7 @@ public:
xmlpp::Element* write_to_cpl(xmlpp::Element* node, Standard standard) const override;
protected:
- std::string cpl_node_name (Standard standard) const override;
+ std::string cpl_node_name() const override;
std::pair<std::string, std::string> cpl_node_namespace() const override;
private:
diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index 1f2ddcdd..dbac6cb3 100644
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -68,7 +68,7 @@ ReelSoundAsset::ReelSoundAsset (shared_ptr<const cxml::Node> node)
string
-ReelSoundAsset::cpl_node_name (Standard) const
+ReelSoundAsset::cpl_node_name() const
{
return "MainSound";
}
diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index 16d629d1..6537ab5c 100644
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -69,7 +69,7 @@ public:
private:
boost::optional<std::string> key_type () const override;
- std::string cpl_node_name (Standard standard) const override;
+ std::string cpl_node_name() const override;
};
diff --git a/src/reel_stereo_picture_asset.cc b/src/reel_stereo_picture_asset.cc
index 13bfec8e..2ee452d9 100644
--- a/src/reel_stereo_picture_asset.cc
+++ b/src/reel_stereo_picture_asset.cc
@@ -64,7 +64,7 @@ ReelStereoPictureAsset::ReelStereoPictureAsset (std::shared_ptr<const cxml::Node
string
-ReelStereoPictureAsset::cpl_node_name (Standard) const
+ReelStereoPictureAsset::cpl_node_name() const
{
return "msp-cpl:MainStereoscopicPicture";
}
diff --git a/src/reel_stereo_picture_asset.h b/src/reel_stereo_picture_asset.h
index 09170ddd..0dd726a4 100644
--- a/src/reel_stereo_picture_asset.h
+++ b/src/reel_stereo_picture_asset.h
@@ -71,7 +71,7 @@ public:
}
private:
- std::string cpl_node_name (Standard standard) const override;
+ std::string cpl_node_name() const override;
std::pair<std::string, std::string> cpl_node_attribute (Standard standard) const override;
};