projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ba983cf
)
Don't truncate active_video_frame_rate to an int otherwise setting fade on non-intege...
v2.15.41
author
Carl Hetherington
<cth@carlh.net>
Fri, 10 Jan 2020 14:20:17 +0000
(15:20 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 10 Jan 2020 14:20:17 +0000
(15:20 +0100)
src/wx/video_panel.cc
patch
|
blob
|
history
diff --git
a/src/wx/video_panel.cc
b/src/wx/video_panel.cc
index 6e237e0d2e3fbe4c2a4cec60179252431bb77587..7f7674c4e408a663a2fb7389304471f7d9d6b08f 100644
(file)
--- a/
src/wx/video_panel.cc
+++ b/
src/wx/video_panel.cc
@@
-630,8
+630,8
@@
void
VideoPanel::fade_in_changed ()
{
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
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));
}
}
}
}
@@
-639,8
+639,8
@@
void
VideoPanel::fade_out_changed ()
{
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
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));
}
}
}
}