Remove some backwards compatibility that will cause problems in an upcoming commit.
authorCarl Hetherington <cth@carlh.net>
Tue, 22 Nov 2022 00:48:37 +0000 (01:48 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 25 Nov 2022 23:09:27 +0000 (00:09 +0100)
src/lib/audio_content.cc
src/lib/video_content.cc

index 82a6a84d1d38d90c875371b9592d9f16d3d7305a..e363cfebde553a6dc0826cffd9624dcd7c19ba98 100644 (file)
@@ -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());
-       }
 }
 
 
index 1d1d010a95662193bc52ab84e5dacb2b8746fb10..ca0076fba8784e4601f46069a0b1714f7bf36152 100644 (file)
@@ -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");