From aaf6845e130ac208cee524536b67c54bd1ce8ed9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 22 Nov 2022 01:48:37 +0100 Subject: [PATCH] Remove some backwards compatibility that will cause problems in an upcoming commit. --- src/lib/audio_content.cc | 6 ------ src/lib/video_content.cc | 6 ------ 2 files changed, 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("AudioFadeIn").get_value_or(0)); _fade_out = ContentTime(node->optional_number_child("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("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 ("VideoWidth"); _size.height = node->number_child ("VideoHeight"); - /* Backwards compatibility */ - auto r = node->optional_number_child("VideoFrameRate"); - if (r) { - _parent->set_video_frame_rate (r.get ()); - } - _use = node->optional_bool_child("Use").get_value_or(true); _length = node->number_child ("VideoLength"); -- 2.30.2