Merge master.

[dcpomatic.git] / src / wx / timing_panel.cc

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 2321fd0dfdbfb7ac84ce8f1d12b603d9064adcf9..cc0639b4ccfd500609c879e41c36df016d4b1b36 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -80,12 +80,14 @@ TimingPanel::film_content_changed (int property)
        if (cl.size() == 1) {
                content = cl.front ();
        }
+
+       int const film_video_frame_rate = _editor->film()->video_frame_rate ();
        
        if (property == ContentProperty::POSITION) {
                if (content) {
-                       _position->set (content->position (), _editor->film()->video_frame_rate ());
+                       _position->set (content->position (), film_video_frame_rate);
                } else {
-                       _position->set (0, 24);
+                       _position->set (DCPTime () , 24);
                }
        } else if (
                property == ContentProperty::LENGTH ||
@@ -93,27 +95,27 @@ TimingPanel::film_content_changed (int property)
                property == VideoContentProperty::VIDEO_FRAME_TYPE
                ) {
                if (content) {
-                       _full_length->set (content->full_length (), _editor->film()->video_frame_rate ());
-                       _play_length->set (content->length_after_trim (), _editor->film()->video_frame_rate ());
+                       _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 (), _editor->film()->video_frame_rate ());
-                       _play_length->set (content->length_after_trim (), _editor->film()->video_frame_rate ());
+                       _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 (), _editor->film()->video_frame_rate ());
-                       _play_length->set (content->length_after_trim (), _editor->film()->video_frame_rate ());
+                       _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);
                }
        }
 
@@ -153,7 +155,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)));
                }
        }
 }
@@ -200,8 +203,8 @@ TimingPanel::set_video_frame_rate ()
                shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c.front ());
                if (ic) {
                        ic->set_video_frame_rate (lexical_cast<float> (wx_to_std (_video_frame_rate->GetValue ())));
-                       _set_video_frame_rate->Enable (false);
                }
+               _set_video_frame_rate->Enable (false);
        }
 }