X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=c7567455b762c393d86624aca6df8a4fe136d191;hb=696ff1c534d59483bed3db06705b554f615a7b85;hp=6ebd83d73e332e4beb14b26487672f08645f3b69;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;p=dcpomatic.git

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 6ebd83d73..c7567455b 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -17,14 +17,17 @@
 
 */
 
-#include "lib/content.h"
-#include "lib/image_content.h"
-#include "lib/raw_convert.h"
 #include "timing_panel.h"
 #include "wx_util.h"
 #include "film_viewer.h"
 #include "timecode.h"
 #include "content_panel.h"
+#include "lib/content.h"
+#include "lib/image_content.h"
+#include "lib/raw_convert.h"
+#include "lib/subtitle_content.h"
+#include "lib/dcp_subtitle_content.h"
+#include "lib/subrip_content.h"
 #include <boost/foreach.hpp>
 #include <set>
 #include <iostream>
@@ -34,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 */
@@ -143,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
@@ -200,7 +208,8 @@ TimingPanel::film_content_changed (int property)
 	} else if (
 		property == ContentProperty::LENGTH ||
 		property == VideoContentProperty::VIDEO_FRAME_RATE ||
-		property == VideoContentProperty::VIDEO_FRAME_TYPE
+		property == VideoContentProperty::VIDEO_FRAME_TYPE ||
+		property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE
 		) {
 
 		update_full_length ();
@@ -237,24 +246,40 @@ TimingPanel::film_content_changed (int property)
 		property == ContentProperty::TRIM_START ||
 		property == ContentProperty::TRIM_END ||
 		property == VideoContentProperty::VIDEO_FRAME_RATE ||
-		property == VideoContentProperty::VIDEO_FRAME_TYPE
+		property == VideoContentProperty::VIDEO_FRAME_TYPE ||
+		property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE
 		) {
 
 		update_play_length ();
 	}
 
-	if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
-		set<double> check;
+	if (property == VideoContentProperty::VIDEO_FRAME_RATE || property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE) {
+		set<double> check_vc;
 		shared_ptr<const VideoContent> vc;
+		int count_sc = 0;
+		shared_ptr<const SubtitleContent> sc;
 		BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
-			shared_ptr<const VideoContent> t = dynamic_pointer_cast<const VideoContent> (i);
-			if (t) {
-				check.insert (t->video_frame_rate ());
-				vc = t;
+			shared_ptr<const VideoContent> vt = dynamic_pointer_cast<const VideoContent> (i);
+			if (vt) {
+				check_vc.insert (vt->video_frame_rate ());
+				vc = vt;
 			}
+			shared_ptr<const SubtitleContent> st = dynamic_pointer_cast<const SubtitleContent> (i);
+			if (st) {
+				++count_sc;
+				sc = st;
+			}
+
 		}
-		if (check.size() == 1) {
-			checked_set (_video_frame_rate, raw_convert<string> (vc->video_frame_rate (), 5));
+
+		bool const single_frame_image_content = vc && dynamic_pointer_cast<const ImageContent> (vc) && vc->number_of_paths() == 1;
+
+		if ((check_vc.size() == 1 || count_sc == 1) && !single_frame_image_content) {
+			if (vc) {
+				checked_set (_video_frame_rate, raw_convert<string> (vc->video_frame_rate (), 5));
+			} else if (sc) {
+				checked_set (_video_frame_rate, raw_convert<string> (sc->subtitle_video_frame_rate (), 5));
+			}
 			_video_frame_rate->Enable (true);
 		} else {
 			checked_set (_video_frame_rate, wxT (""));
@@ -273,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
@@ -298,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
@@ -335,8 +392,14 @@ TimingPanel::set_video_frame_rate ()
 {
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (i);
+		shared_ptr<DCPSubtitleContent> dsc = dynamic_pointer_cast<DCPSubtitleContent> (i);
+		shared_ptr<SubRipContent> ssc = dynamic_pointer_cast<SubRipContent> (i);
 		if (vc) {
 			vc->set_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
+		} else if (dsc) {
+			dsc->set_subtitle_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
+		} else if (ssc) {
+			ssc->set_subtitle_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
 		}
 		_set_video_frame_rate->Enable (false);
 	}
@@ -345,20 +408,14 @@ 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);
 	film_content_changed (ContentProperty::TRIM_START);
 	film_content_changed (ContentProperty::TRIM_END);
 	film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+	film_content_changed (SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE);
 }
 
 void
@@ -374,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
@@ -389,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);
 }