X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=184356a20cb39fc2ab80fcce5eac69f3ac529796;hb=981100bbff6883ff024b41d4b62e00b2ab8caec4;hp=f10815ca42c1ce44f5305b79ea8a4666f4c9eeb0;hpb=bb4af4ee38488120090de1879ee43a27ba2d4537;p=dcpomatic.git

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index f10815ca4..184356a20 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -48,12 +48,14 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
 	/* horrid hack for apparent lack of context support with wxWidgets i18n code */
 	/// TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix
 	: ContentSubPanel (p, S_("Timing|Timing"))
 	, _viewer (viewer)
+	, _film_content_changed_suspender (boost::bind(&TimingPanel::film_content_changed, this, _1))
 {
 	wxSize size = TimecodeBase::size (this);
 
@@ -255,6 +257,10 @@ TimingPanel::update_play_length ()
 void
 TimingPanel::film_content_changed (int property)
 {
+	if (_film_content_changed_suspender.check(property)) {
+		return;
+	}
+
 	int const film_video_frame_rate = _parent->film()->video_frame_rate ();
 
 	/* Here we check to see if we have exactly one different value of various
@@ -404,8 +410,7 @@ TimingPanel::trim_start_changed ()
 	optional<FrameRateChange> ref_frc;
 	optional<DCPTime> ref_ph;
 
-	ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ());
-
+	Suspender::Block bl = _film_content_changed_suspender.block ();
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		if (i->position() <= ph && ph < i->end(_parent->film())) {
 			/* The playhead is in i.  Use it as a reference to work out
@@ -417,6 +422,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 +443,9 @@ TimingPanel::trim_end_changed ()
 
 	fv->set_coalesce_player_changes (true);
 
-	ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ());
+	Suspender::Block bl = _film_content_changed_suspender.block ();
 	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);
 	}
 
@@ -447,13 +454,14 @@ TimingPanel::trim_end_changed ()
 		fv->seek (_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true);
 	}
 
-	fv->set_coalesce_player_changes (true);
+	fv->set_coalesce_player_changes (false);
 }
 
 void
 TimingPanel::play_length_changed ()
 {
 	DCPTime const play_length = _play_length->get (_parent->film()->video_frame_rate());
+	Suspender::Block bl = _film_content_changed_suspender.block ();
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
 		i->set_trim_end (
@@ -490,6 +498,7 @@ TimingPanel::set_video_frame_rate ()
 	if (_video_frame_rate->GetValue() != wxT("")) {
 		fr = locale_convert<double> (wx_to_std (_video_frame_rate->GetValue ()));
 	}
+	Suspender::Block bl = _film_content_changed_suspender.block ();
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		if (fr) {
 			i->set_video_frame_rate (*fr);