diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-09-20 10:22:10 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-01 00:20:04 +0200 |
| commit | dcc46f2a5243bfdccf700d5f3ace85ff8cd569f8 (patch) | |
| tree | 227d591aa1c22143f9f8242da428ee2bd5420efc | |
| parent | 034b42d11929a038eda2208b351115e0013d2b88 (diff) | |
Use content video frame rate rather than the DCP one when reading
trim start/end back from the UI. See #1607.
Backported from 3e6214d3dce7deceb98436e416747aaff72bf561 in v2.15.x.
| -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 f10815ca4..d3bdc923d 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -404,7 +404,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())) { @@ -417,6 +416,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); } @@ -437,8 +437,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); } |