diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-09-29 22:56:55 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-10-05 23:22:30 +0200 |
| commit | 4ba1475736d36fe3b6b3e9ce653cde561695e7e6 (patch) | |
| tree | fa58363210774d4d4fbf2f1fbfde2ae07c732bc5 /src/lib | |
| parent | 7da1ba1be59c48af133b2fec83dc272ef21ba2db (diff) | |
Rename XML tags Fade{In,Out} to VideoFade{In,Out}.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 4 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index ded96ab45..b624b234b 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -142,8 +142,10 @@ static constexpr char assets_file[] = "assets.xml"; * have had Subtitle prefixes or suffixes removed. * 37 -> 38 * VideoContent scale expressed just as "guess" or "custom" + * 38 -> 39 + * Fade{In,Out} -> VideoFade{In,Out} */ -int const Film::current_state_version = 38; +int const Film::current_state_version = 39; /** Construct a Film object in a given directory. diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 10dd5ff1e..058bb4ea2 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -175,8 +175,10 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio _yuv = node->optional_bool_child("YUV").get_value_or (true); - if (version >= 32) { - /* These should be VideoFadeIn and VideoFadeOut but we'll leave them like this until 2.18.x */ + if (version >= 39) { + _fade_in = node->number_child<Frame>("VideoFadeIn"); + _fade_out = node->number_child<Frame>("VideoFadeOut"); + } else if (version >= 32) { _fade_in = node->number_child<Frame> ("FadeIn"); _fade_out = node->number_child<Frame> ("FadeOut"); } else { @@ -298,8 +300,8 @@ VideoContent::as_xml(xmlpp::Element* element) const _colour_conversion.get().as_xml(cxml::add_child(element, "ColourConversion")); } cxml::add_text_child(element, "YUV", _yuv ? "1" : "0"); - cxml::add_text_child(element, "FadeIn", raw_convert<string>(_fade_in)); - cxml::add_text_child(element, "FadeOut", raw_convert<string>(_fade_out)); + cxml::add_text_child(element, "VideoFadeIn", raw_convert<string>(_fade_in)); + cxml::add_text_child(element, "VideoFadeOut", raw_convert<string>(_fade_out)); cxml::add_text_child(element, "Range", _range == VideoRange::FULL ? "full" : "video"); _pixel_quanta.as_xml(cxml::add_child(element, "PixelQuanta")); if (_burnt_subtitle_language) { |