From: Carl Hetherington <cth@carlh.net>
Date: Fri, 10 Jan 2020 14:20:17 +0000 (+0100)
Subject: Don't truncate active_video_frame_rate to an int otherwise setting fade on non-intege... 
X-Git-Tag: v2.14.23~4
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=62df0ab98a3285adcbacdcc4096ac0b7da466c9c

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.
---

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));
 	}
 }