X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ftiming_panel.cc;fp=src%2Fwx%2Ftiming_panel.cc;h=f33e052a1ad41dad2f2adea9b0b7aa39f7823ceb;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hp=5cefe318af333d35ff68da2c02482325d57721c2;hpb=931fa4ef2dbfb7c9f726c4dd41eea79621b49906;p=dcpomatic.git

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 5cefe318a..f33e052a1 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -88,47 +88,43 @@ TimingPanel::film_content_changed (int property)
 		if (content) {
 			_position->set (content->position (), film_video_frame_rate);
 		} else {
-			_position->set (0, 24);
+			_position->set (DCPTime () , 24);
 		}
 	} else if (
 		property == ContentProperty::LENGTH ||
 		property == VideoContentProperty::VIDEO_FRAME_RATE ||
-		property == VideoContentProperty::VIDEO_FRAME_TYPE ||
-		property == SndfileContentProperty::VIDEO_FRAME_RATE
+		property == VideoContentProperty::VIDEO_FRAME_TYPE
 		) {
 		if (content) {
 			_full_length->set (content->full_length (), film_video_frame_rate);
 			_play_length->set (content->length_after_trim (), film_video_frame_rate);
 		} else {
-			_full_length->set (0, 24);
-			_play_length->set (0, 24);
+			_full_length->set (DCPTime (), 24);
+			_play_length->set (DCPTime (), 24);
 		}
 	} else if (property == ContentProperty::TRIM_START) {
 		if (content) {
 			_trim_start->set (content->trim_start (), film_video_frame_rate);
 			_play_length->set (content->length_after_trim (), film_video_frame_rate);
 		} else {
-			_trim_start->set (0, 24);
-			_play_length->set (0, 24);
+			_trim_start->set (DCPTime (), 24);
+			_play_length->set (DCPTime (), 24);
 		}
 	} else if (property == ContentProperty::TRIM_END) {
 		if (content) {
 			_trim_end->set (content->trim_end (), film_video_frame_rate);
 			_play_length->set (content->length_after_trim (), film_video_frame_rate);
 		} else {
-			_trim_end->set (0, 24);
-			_play_length->set (0, 24);
+			_trim_end->set (DCPTime (), 24);
+			_play_length->set (DCPTime (), 24);
 		}
 	}
 
 	if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
 		if (content) {
 			shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (content);
-			shared_ptr<SndfileContent> sc = dynamic_pointer_cast<SndfileContent> (content);
 			if (vc) {
 				_video_frame_rate->SetValue (std_to_wx (lexical_cast<string> (vc->video_frame_rate ())));
-			} else if (sc) {
-				_video_frame_rate->SetValue (std_to_wx (lexical_cast<string> (sc->video_frame_rate ())));
 			} else {
 				_video_frame_rate->SetValue ("24");
 			}
@@ -161,7 +157,8 @@ TimingPanel::full_length_changed ()
 	if (c.size() == 1) {
 		shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c.front ());
 		if (ic && ic->still ()) {
-			ic->set_video_length (rint (_full_length->get (_editor->film()->video_frame_rate()) * ic->video_frame_rate() / TIME_HZ));
+			/* XXX: No effective FRC here... is this right? */
+			ic->set_video_length (ContentTime (_full_length->get (_editor->film()->video_frame_rate()), FrameRateChange (1, 1)));
 		}
 	}
 }
@@ -209,10 +206,6 @@ TimingPanel::set_video_frame_rate ()
 		if (ic) {
 			ic->set_video_frame_rate (lexical_cast<float> (wx_to_std (_video_frame_rate->GetValue ())));
 		}
-		shared_ptr<SndfileContent> sc = dynamic_pointer_cast<SndfileContent> (c.front ());
-		if (sc) {
-			sc->set_video_frame_rate (lexical_cast<float> (wx_to_std (_video_frame_rate->GetValue ())));
-		}
 		_set_video_frame_rate->Enable (false);
 	}
 }