diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-09-20 10:22:10 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-09-27 22:33:51 +0200 |
| commit | 15ee4641d8b89a16b15611443870d0932152066f (patch) | |
| tree | 2e471a5374f4ac21c8ef889d2e32b138acba0808 /src | |
| parent | 400e34c23ba9ec240358cd028f90fba38bbf1560 (diff) | |
Use content video frame rate rather than the DCP one when reading
trim start/end back from the UI. See #1607.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/timing_panel.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 06d655b6b..0295b0b1d 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -405,7 +405,6 @@ TimingPanel::trim_start_changed () optional<FrameRateChange> ref_frc; optional<DCPTime> ref_ph; - ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ()); BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) { if (i->position() <= ph && ph < i->end(_parent->film())) { @@ -418,6 +417,7 @@ TimingPanel::trim_start_changed () ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get()); } + ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate())); i->set_trim_start (trim); } @@ -438,8 +438,8 @@ TimingPanel::trim_end_changed () fv->set_coalesce_player_changes (true); - ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ()); BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) { + ContentTime const trim = _trim_end->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate())); i->set_trim_end (trim); } |