diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-07 09:35:59 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-07 09:35:59 +0000 |
| commit | 076b9bd477232feb6d0a1a9789f241f358b58761 (patch) | |
| tree | 410a169c89f7e6c1d6031e1ceb09e2d7a3523e69 /src | |
| parent | ea6240f349a27e1e8f4f03ee69640e3a2939d958 (diff) | |
Update content lengths when changing frame rate.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/timing_panel.cc | 6 |
1 files changed, 4 insertions, 2 deletions
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<VideoContent> vc = dynamic_pointer_cast<VideoContent> (content); if (vc) { |