diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-01-27 20:27:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-01-27 20:27:43 +0100 |
| commit | 4af0c52152c2d80e7c3082852c1ecb6eb5543f6a (patch) | |
| tree | 21fb0330e664a9130538a779b49a69d73bef45f6 /src | |
| parent | b210e46788f6cd368657dbef602cf91e12adc99a (diff) | |
Fix bug reading fade in/out tags introduced in
7ca647ac6ae51893f2714d72816a4449a18e6c57
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/video_content.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 10a611691..e52444678 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -179,8 +179,18 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio _yuv = node->optional_bool_child("YUV").get_value_or (true); if (version >= 32) { - _fade_in = node->optional_number_child<Frame>("VideoFadeIn").get_value_or(node->number_child<Frame>("FadeIn")); - _fade_out = node->optional_number_child<Frame>("VideoFadeOut").get_value_or(node->number_child<Frame>("FadeOut")); + auto vfi = node->optional_number_child<Frame>("VideoFadeIn"); + if (vfi) { + _fade_in = *vfi; + } else { + _fade_in = node->number_child<Frame>("FadeIn"); + } + auto vfo = node->optional_number_child<Frame>("VideoFadeOut"); + if (vfo) { + _fade_out = *vfo; + } else { + _fade_out = node->number_child<Frame>("FadeOut"); + } } else { _fade_in = _fade_out = 0; } |