X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=c7567455b762c393d86624aca6df8a4fe136d191;hb=03dd6e03f5ee261b9c1ed9328ad2762ef3b62057;hp=f05268f92434d79626268eebfe936716a9bf35a9;hpb=9af90d8c2c88b86a2d6b7b9c4e7096e0ba4a4cf0;p=dcpomatic.git

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index f05268f92..c7567455b 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -37,6 +37,7 @@ using std::string;
 using std::set;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
 TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
 	/* horrid hack for apparent lack of context support with wxWidgets i18n code */
@@ -146,6 +147,10 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
 	_play_length->Changed.connect (boost::bind (&TimingPanel::play_length_changed, this));
 	_video_frame_rate->Bind       (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TimingPanel::video_frame_rate_changed, this));
 	_set_video_frame_rate->Bind   (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimingPanel::set_video_frame_rate, this));
+
+	_viewer->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this));
+
+	setup_sensitivity ();
 }
 
 void
@@ -293,6 +298,7 @@ TimingPanel::film_content_changed (int property)
 	_full_length->set_editable (have_still);
 	_play_length->set_editable (!have_still);
 	_set_video_frame_rate->Enable (false);
+	setup_sensitivity ();
 }
 
 void
@@ -318,18 +324,49 @@ TimingPanel::full_length_changed ()
 void
 TimingPanel::trim_start_changed ()
 {
+	DCPTime const ph = _viewer->position ();
+
+	_viewer->set_coalesce_player_changes (true);
+
+	shared_ptr<Content> ref;
+	optional<FrameRateChange> ref_frc;
+	optional<DCPTime> ref_ph;
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+		if (i->position() <= ph && ph < i->end()) {
+			/* The playhead is in i.  Use it as a reference to work out
+			   where to put the playhead post-trim; we're trying to keep the playhead
+			   at the same frame of content that we're looking at pre-trim.
+			*/
+			ref = i;
+			ref_frc = _parent->film()->active_frame_rate_change (i->position ());
+			ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get());
+		}
+
 		i->set_trim_start (_trim_start->get (_parent->film()->video_frame_rate ()));
 	}
-}
 
+	if (ref) {
+		_viewer->set_position (max (DCPTime(), ref_ph.get() + ref->position() - DCPTime (ref->trim_start(), ref_frc.get())));
+	}
+
+	_viewer->set_coalesce_player_changes (false);
+}
 
 void
 TimingPanel::trim_end_changed ()
 {
+	_viewer->set_coalesce_player_changes (true);
+
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		i->set_trim_end (_trim_end->get (_parent->film()->video_frame_rate ()));
 	}
+
+	/* XXX: maybe playhead-off-the-end-of-the-film should be handled elsewhere */
+	if (_viewer->position() >= _parent->film()->length()) {
+		_viewer->set_position (_parent->film()->length() - DCPTime::from_frames (1, _parent->film()->video_frame_rate()));
+	}
+
+	_viewer->set_coalesce_player_changes (true);
 }
 
 void
@@ -371,14 +408,7 @@ TimingPanel::set_video_frame_rate ()
 void
 TimingPanel::content_selection_changed ()
 {
-	bool const e = !_parent->selected().empty ();
-
-	_position->Enable (e);
-	_full_length->Enable (e);
-	_trim_start->Enable (e);
-	_trim_end->Enable (e);
-	_play_length->Enable (e);
-	_video_frame_rate->Enable (e);
+	setup_sensitivity ();
 
 	film_content_changed (ContentProperty::POSITION);
 	film_content_changed (ContentProperty::LENGTH);
@@ -401,12 +431,23 @@ void
 TimingPanel::trim_start_to_playhead_clicked ()
 {
 	DCPTime const ph = _viewer->position ();
+	optional<DCPTime> new_ph;
+
+	_viewer->set_coalesce_player_changes (true);
+
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		if (i->position() < ph && ph < i->end ()) {
 			FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
 			i->set_trim_start (i->trim_start() + ContentTime (ph - i->position (), frc));
+			new_ph = i->position ();
 		}
 	}
+
+	if (new_ph) {
+		_viewer->set_position (new_ph.get());
+	}
+
+	_viewer->set_coalesce_player_changes (false);
 }
 
 void
@@ -416,8 +457,31 @@ TimingPanel::trim_end_to_playhead_clicked ()
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		if (i->position() < ph && ph < i->end ()) {
 			FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
-			i->set_trim_end (ContentTime (i->position() + i->full_length() - ph, frc) - i->trim_start());
+			i->set_trim_end (ContentTime (i->position() + i->full_length() - ph - DCPTime::from_frames (1, frc.dcp), frc) - i->trim_start());
 		}
+	}
+}
+
+void
+TimingPanel::setup_sensitivity ()
+{
+	bool const e = !_parent->selected().empty ();
 
+	_position->Enable (e);
+	_full_length->Enable (e);
+	_trim_start->Enable (e);
+	_trim_end->Enable (e);
+	_play_length->Enable (e);
+	_video_frame_rate->Enable (e);
+
+	DCPTime const ph = _viewer->position ();
+	bool any_over_ph = false;
+	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+		if (i->position() <= ph && ph < i->end()) {
+			any_over_ph = true;
+		}
 	}
+
+	_trim_start_to_playhead->Enable (any_over_ph);
+	_trim_end_to_playhead->Enable (any_over_ph);
 }