From 076b9bd477232feb6d0a1a9789f241f358b58761 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 7 Jan 2014 09:35:59 +0000 Subject: Update content lengths when changing frame rate. --- src/wx/timing_panel.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index fdaf9c807..34702463c 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -87,7 +87,7 @@ TimingPanel::film_content_changed (int property) } else { _position->set (0, 24); } - } else if (property == ContentProperty::LENGTH) { + } else if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_RATE) { 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 ()); @@ -111,7 +111,9 @@ TimingPanel::film_content_changed (int property) _trim_end->set (0, 24); _play_length->set (0, 24); } - } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) { + } + + if (property == VideoContentProperty::VIDEO_FRAME_RATE) { if (content) { shared_ptr vc = dynamic_pointer_cast (content); if (vc) { -- cgit v1.2.3