From afa7b7e7240198d86146e6fe8c7911e049ee4f95 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 3 May 2019 22:10:21 +0000 Subject: [PATCH] Disallow unsetting the frame rate on FFmpeg/DCP content (#1547). --- src/wx/timing_panel.cc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 7e7dd6fbd..f10815ca4 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -33,6 +33,8 @@ #include "lib/audio_content.h" #include "lib/string_text_file_content.h" #include "lib/video_content.h" +#include "lib/dcp_content.h" +#include "lib/ffmpeg_content.h" #include #include #include @@ -463,7 +465,22 @@ TimingPanel::play_length_changed () void TimingPanel::video_frame_rate_changed () { - _set_video_frame_rate->Enable (true); + bool enable = true; + if (_video_frame_rate->GetValue() == wxT("")) { + /* No frame rate has been entered; if the user clicks "set" now it would unset the video + frame rate in the selected content. This can't be allowed for some content types. + */ + BOOST_FOREACH (shared_ptr i, _parent->selected()) { + if ( + dynamic_pointer_cast(i) || + dynamic_pointer_cast(i) + ) { + enable = false; + } + } + } + + _set_video_frame_rate->Enable (enable); } void -- 2.30.2