diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-28 17:53:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-29 20:04:36 +0100 |
| commit | a0d1dd5d91c81ec9907cbc7b890905c463c18f62 (patch) | |
| tree | 3dc0b2e5b7e3a4e7da7d687c8713e0b461ce2aeb /src/wx | |
| parent | 2da067ce01a04964dd5d739ea695504517877507 (diff) | |
Replace Time::frames with Time::frames_round and Time::frames_floor.
I believe both are necessary; doing floor instead of round caused #648.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/timing_panel.cc | 2 | ||||
| -rw-r--r-- | src/wx/video_panel.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index f92505c33..53e109224 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -296,7 +296,7 @@ TimingPanel::full_length_changed () shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i); if (ic && ic->still ()) { int const vfr = _parent->film()->video_frame_rate (); - ic->set_video_length (_full_length->get (vfr).frames (vfr)); + ic->set_video_length (_full_length->get (vfr).frames_round (vfr)); } } } diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index aa8e946da..68ff7c369 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -426,7 +426,7 @@ VideoPanel::fade_in_changed () VideoContentList vc = _parent->selected_video (); for (VideoContentList::const_iterator i = vc.begin(); i != vc.end(); ++i) { int const vfr = _parent->film()->video_frame_rate (); - (*i)->set_fade_in (_fade_in->get (vfr).frames (vfr)); + (*i)->set_fade_in (_fade_in->get (vfr).frames_round (vfr)); } } @@ -436,6 +436,6 @@ VideoPanel::fade_out_changed () VideoContentList vc = _parent->selected_video (); for (VideoContentList::const_iterator i = vc.begin(); i != vc.end(); ++i) { int const vfr = _parent->film()->video_frame_rate (); - (*i)->set_fade_out (_fade_out->get (vfr).frames (vfr)); + (*i)->set_fade_out (_fade_out->get (vfr).frames_round (vfr)); } } |