X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=9bb608cb2637b8f66b5e3b5fcca327267247f49d;hb=cbd4450197a083bf58bda510e626f73ba583cb66;hp=1e87f8e8debf5e0d360ab16a038103c15145278c;hpb=439953204388991b96fce215c62396a7b6d33acd;p=dcpomatic.git

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 1e87f8e8d..9bb608cb2 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -26,12 +26,12 @@
 #include "move_to_dialog.h"
 #include "lib/content.h"
 #include "lib/image_content.h"
-#include "lib/raw_convert.h"
-#include "lib/subtitle_content.h"
+#include "lib/caption_content.h"
 #include "lib/dcp_subtitle_content.h"
 #include "lib/audio_content.h"
-#include "lib/text_subtitle_content.h"
+#include "lib/text_caption_file_content.h"
 #include "lib/video_content.h"
+#include <dcp/locale_convert.h>
 #include <boost/foreach.hpp>
 #include <set>
 #include <iostream>
@@ -42,6 +42,7 @@ using std::set;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using dcp::locale_convert;
 
 TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
 	/* horrid hack for apparent lack of context support with wxWidgets i18n code */
@@ -128,7 +129,7 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
 	 * http://trac.wxwidgets.org/ticket/13389
 	 */
 
-	wxString in = _("<i>Only change this if it the content's frame rate has been read incorrectly.</i>");
+	wxString in = _("<i>Only change this if the content's frame rate has been read incorrectly.</i>");
 	wxString out;
 	int const width = 20;
 	int current = 0;
@@ -144,18 +145,25 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
 
 	t = new wxStaticText (this, wxID_ANY, wxT (""));
 	t->SetLabelMarkup (out);
+#ifdef DCPOMATIC_OSX
+	/* Hack to stop hidden text on some versions of OS X */
+	t->SetMinSize (wxSize (-1, 256));
+#endif
 	grid->Add (t, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6);
 
+	/* Completely speculative fix for #891 */
+	grid->Layout ();
+
 	_position->Changed.connect    (boost::bind (&TimingPanel::position_changed, this));
-	_move_to_start_of_reel->Bind  (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimingPanel::move_to_start_of_reel_clicked, this));
+	_move_to_start_of_reel->Bind  (wxEVT_BUTTON, boost::bind (&TimingPanel::move_to_start_of_reel_clicked, this));
 	_full_length->Changed.connect (boost::bind (&TimingPanel::full_length_changed, this));
 	_trim_start->Changed.connect  (boost::bind (&TimingPanel::trim_start_changed, this));
-	_trim_start_to_playhead->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimingPanel::trim_start_to_playhead_clicked, this));
+	_trim_start_to_playhead->Bind (wxEVT_BUTTON, boost::bind (&TimingPanel::trim_start_to_playhead_clicked, this));
 	_trim_end->Changed.connect    (boost::bind (&TimingPanel::trim_end_changed, this));
-	_trim_end_to_playhead->Bind   (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimingPanel::trim_end_to_playhead_clicked, this));
+	_trim_end_to_playhead->Bind   (wxEVT_BUTTON, boost::bind (&TimingPanel::trim_end_to_playhead_clicked, this));
 	_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));
+	_video_frame_rate->Bind       (wxEVT_TEXT, boost::bind (&TimingPanel::video_frame_rate_changed, this));
+	_set_video_frame_rate->Bind   (wxEVT_BUTTON, boost::bind (&TimingPanel::set_video_frame_rate, this));
 
 	_viewer->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this));
 
@@ -274,7 +282,7 @@ TimingPanel::film_content_changed (int property)
 				++count_ac;
 				content = i;
 			}
-			if (i->subtitle && i->video_frame_rate()) {
+			if (!i->caption.empty() && i->video_frame_rate()) {
 				++count_sc;
 				content = i;
 			}
@@ -284,7 +292,7 @@ TimingPanel::film_content_changed (int property)
 		bool const single_frame_image_content = content && dynamic_pointer_cast<const ImageContent> (content) && content->number_of_paths() == 1;
 
 		if ((check_vc.size() == 1 || count_ac == 1 || count_sc == 1) && !single_frame_image_content) {
-			checked_set (_video_frame_rate, raw_convert<string> (content->video_frame_rate().get(), 5));
+			checked_set (_video_frame_rate, locale_convert<string> (content->video_frame_rate().get(), 5));
 			_video_frame_rate->Enable (true);
 		} else {
 			checked_set (_video_frame_rate, wxT (""));
@@ -309,19 +317,21 @@ TimingPanel::film_content_changed (int property)
 void
 TimingPanel::position_changed ()
 {
+	DCPTime const pos = _position->get (_parent->film()->video_frame_rate ());
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-		i->set_position (_position->get (_parent->film()->video_frame_rate ()));
+		i->set_position (pos);
 	}
 }
 
 void
 TimingPanel::full_length_changed ()
 {
+	int const vfr = _parent->film()->video_frame_rate ();
+	Frame const len = _full_length->get (vfr).frames_round (vfr);
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
 		if (ic && ic->still ()) {
-			int const vfr = _parent->film()->video_frame_rate ();
-			ic->video->set_length (_full_length->get (vfr).frames_round (vfr));
+			ic->video->set_length (len);
 		}
 	}
 }
@@ -336,6 +346,9 @@ TimingPanel::trim_start_changed ()
 	shared_ptr<Content> ref;
 	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()) {
 			/* The playhead is in i.  Use it as a reference to work out
@@ -347,7 +360,7 @@ TimingPanel::trim_start_changed ()
 			ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get());
 		}
 
-		i->set_trim_start (_trim_start->get (_parent->film()->video_frame_rate ()));
+		i->set_trim_start (trim);
 	}
 
 	if (ref) {
@@ -362,8 +375,9 @@ TimingPanel::trim_end_changed ()
 {
 	_viewer->set_coalesce_player_changes (true);
 
+	ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ());
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-		i->set_trim_end (_trim_end->get (_parent->film()->video_frame_rate ()));
+		i->set_trim_end (trim);
 	}
 
 	/* XXX: maybe playhead-off-the-end-of-the-film should be handled elsewhere */
@@ -377,11 +391,11 @@ TimingPanel::trim_end_changed ()
 void
 TimingPanel::play_length_changed ()
 {
+	DCPTime const play_length = _play_length->get (_parent->film()->video_frame_rate());
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
 		i->set_trim_end (
-			ContentTime (i->full_length() - _play_length->get (_parent->film()->video_frame_rate()), frc)
-			- i->trim_start ()
+			ContentTime (max(DCPTime(), i->full_length() - play_length), frc) - i->trim_start ()
 			);
 	}
 }
@@ -395,9 +409,16 @@ TimingPanel::video_frame_rate_changed ()
 void
 TimingPanel::set_video_frame_rate ()
 {
-	double const fr = raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ()));
+	optional<double> fr;
+	if (_video_frame_rate->GetValue() != wxT("")) {
+		fr = locale_convert<double> (wx_to_std (_video_frame_rate->GetValue ()));
+	}
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-		i->set_video_frame_rate (fr);
+		if (fr) {
+			i->set_video_frame_rate (*fr);
+		} else {
+			i->unset_video_frame_rate ();
+		}
 	}
 
 	_set_video_frame_rate->Enable (false);
@@ -427,14 +448,15 @@ TimingPanel::film_changed (Film::Property p)
 void
 TimingPanel::trim_start_to_playhead_clicked ()
 {
-	DCPTime const ph = _viewer->position ();
+	shared_ptr<const Film> film = _parent->film ();
+	DCPTime const ph = _viewer->position().floor (film->video_frame_rate ());
 	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 ());
+			FrameRateChange const frc = film->active_frame_rate_change (i->position ());
 			i->set_trim_start (i->trim_start() + ContentTime (ph - i->position (), frc));
 			new_ph = i->position ();
 		}
@@ -450,10 +472,11 @@ TimingPanel::trim_start_to_playhead_clicked ()
 void
 TimingPanel::trim_end_to_playhead_clicked ()
 {
-	DCPTime const ph = _viewer->position ();
+	shared_ptr<const Film> film = _parent->film ();
+	DCPTime const ph = _viewer->position().floor (film->video_frame_rate ());
 	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 ());
+			FrameRateChange const frc = film->active_frame_rate_change (i->position ());
 			i->set_trim_end (ContentTime (i->position() + i->full_length() - ph - DCPTime::from_frames (1, frc.dcp), frc) - i->trim_start());
 		}
 	}
@@ -465,6 +488,7 @@ TimingPanel::setup_sensitivity ()
 	bool const e = !_parent->selected().empty ();
 
 	_position->Enable (e);
+	_move_to_start_of_reel->Enable (e);
 	_full_length->Enable (e);
 	_trim_start->Enable (e);
 	_trim_end->Enable (e);