diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-06 01:10:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-06 01:10:27 +0000 |
| commit | 9af90d8c2c88b86a2d6b7b9c4e7096e0ba4a4cf0 (patch) | |
| tree | 08e66842b8158bec53b2e6fdd2afbfc2d5bbf737 /src/wx | |
| parent | aedaebb9a265128110085d3ca0ad5604409f0ddb (diff) | |
Allow single-frame image contents to adjust their video frame rates to that of the DCP (fixes #714).
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_panel.cc | 7 | ||||
| -rw-r--r-- | src/wx/timing_panel.cc | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 8ca0d5b29..a84698032 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -526,11 +526,6 @@ ContentPanel::add_files (list<boost::filesystem::path> paths) /* XXX: check for lots of files here and do something */ for (list<boost::filesystem::path>::const_iterator i = paths.begin(); i != paths.end(); ++i) { - shared_ptr<Content> c = content_factory (_film, *i); - shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c); - if (ic) { - ic->set_video_frame_rate (24); - } - _film->examine_and_add_content (c); + _film->examine_and_add_content (content_factory (_film, *i)); } } diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index e416a671c..f05268f92 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -267,7 +267,9 @@ TimingPanel::film_content_changed (int property) } - if (check_vc.size() == 1 || count_sc == 1) { + bool const single_frame_image_content = vc && dynamic_pointer_cast<const ImageContent> (vc) && vc->number_of_paths() == 1; + + if ((check_vc.size() == 1 || count_sc == 1) && !single_frame_image_content) { if (vc) { checked_set (_video_frame_rate, raw_convert<string> (vc->video_frame_rate (), 5)); } else if (sc) { |