summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-11-22 01:48:37 +0100
committerCarl Hetherington <cth@carlh.net>2022-11-26 00:09:27 +0100
commitaaf6845e130ac208cee524536b67c54bd1ce8ed9 (patch)
treeb7de1c6abaaddf74a6524eaf9870595575d6e818 /src
parent5334f1c120ed248f22a5751d47555cf94bf9b4a9 (diff)
Remove some backwards compatibility that will cause problems in an upcoming commit.
Diffstat (limited to 'src')
-rw-r--r--src/lib/audio_content.cc6
-rw-r--r--src/lib/video_content.cc6
2 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 82a6a84d1..e363cfebd 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -97,12 +97,6 @@ AudioContent::AudioContent (Content* parent, cxml::ConstNodePtr node)
_fade_in = ContentTime(node->optional_number_child<ContentTime::Type>("AudioFadeIn").get_value_or(0));
_fade_out = ContentTime(node->optional_number_child<ContentTime::Type>("AudioFadeOut").get_value_or(0));
_use_same_fades_as_video = node->optional_bool_child("AudioUseSameFadesAsVideo").get_value_or(false);
-
- /* Backwards compatibility */
- auto r = node->optional_number_child<double>("AudioVideoFrameRate");
- if (r) {
- _parent->set_video_frame_rate (r.get());
- }
}
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 1d1d010a9..ca0076fba 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -105,12 +105,6 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
_size.width = node->number_child<int> ("VideoWidth");
_size.height = node->number_child<int> ("VideoHeight");
- /* Backwards compatibility */
- auto r = node->optional_number_child<double>("VideoFrameRate");
- if (r) {
- _parent->set_video_frame_rate (r.get ());
- }
-
_use = node->optional_bool_child("Use").get_value_or(true);
_length = node->number_child<Frame> ("VideoLength");