From: Carl Hetherington <cth@carlh.net>
Date: Fri, 20 Sep 2019 08:22:10 +0000 (+0200)
Subject: Use content video frame rate rather than the DCP one when reading
X-Git-Tag: v2.15.20~4
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=15ee4641d8b89a16b15611443870d0932152066f

Use content video frame rate rather than the DCP one when reading
trim start/end back from the UI.  See #1607.
---

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