X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=bf987e51e1fc412483bce9a0a2a7e40f33716d7d;hp=d7ed46f467eca85192d6b6c355cf375830a72d9b;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hpb=c8be0644833dce6ff39202430bba0ab358f3e096

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index d7ed46f46..bf987e51e 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -26,10 +26,10 @@
 #include "move_to_dialog.h"
 #include "lib/content.h"
 #include "lib/image_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
 #include "lib/dcp_subtitle_content.h"
 #include "lib/audio_content.h"
-#include "lib/text_subtitle_content.h"
+#include "lib/string_text_file_content.h"
 #include "lib/video_content.h"
 #include <dcp/locale_convert.h>
 #include <boost/foreach.hpp>
@@ -282,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;
 			}
@@ -395,7 +395,7 @@ TimingPanel::play_length_changed ()
 	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, frc) - i->trim_start ()
+			ContentTime (max(DCPTime(), i->full_length() - play_length), frc) - i->trim_start ()
 			);
 	}
 }
@@ -409,9 +409,16 @@ TimingPanel::video_frame_rate_changed ()
 void
 TimingPanel::set_video_frame_rate ()
 {
-	double const fr = locale_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);