diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-01-10 15:20:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-01-10 15:22:49 +0100 |
| commit | 62df0ab98a3285adcbacdcc4096ac0b7da466c9c (patch) | |
| tree | 2e45965d1effcf46822d2939cc34770e3ec17e4c | |
| parent | 4285355ff2bec853924647f0523d121860fe64e3 (diff) | |
Don't truncate active_video_frame_rate to an int otherwise setting fade on non-integer-rate sources behaves oddly.
Backported from a972af6dcbdb0b8a1c5386d34a0cea2c12738a67 in v2.15.x.
| -rw-r--r-- | src/wx/video_panel.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 35019d0ca..1dc0185ba 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -555,8 +555,8 @@ void VideoPanel::fade_in_changed () { BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) { - int const vfr = i->active_video_frame_rate (_parent->film()); - i->video->set_fade_in (_fade_in->get (vfr).frames_round (vfr)); + double const vfr = i->active_video_frame_rate (_parent->film()); + i->video->set_fade_in (_fade_in->get(vfr).frames_round(vfr)); } } @@ -564,8 +564,8 @@ void VideoPanel::fade_out_changed () { BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) { - int const vfr = i->active_video_frame_rate (_parent->film()); - i->video->set_fade_out (_fade_out->get (vfr).frames_round (vfr)); + double const vfr = i->active_video_frame_rate (_parent->film()); + i->video->set_fade_out (_fade_out->get(vfr).frames_round(vfr)); } } |