diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-09 11:10:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-09 11:10:00 +0000 |
| commit | 472645d0c06971808dba3020cb66186394281de7 (patch) | |
| tree | 95e0450c07f62cb15ce092d4e686291f31a2f57c /src | |
| parent | 7ae12bf65a8fe67e89d7be5f923832fbad6caaad (diff) | |
Hand-apply 22c79dac4ae2b01b448cc5886f8e8ff3a0cfb69b from master; fix broken still image support.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/content_panel.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 4d73a608d..2dc75f8c2 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -248,7 +248,12 @@ ContentPanel::add_file_clicked () /* XXX: check for lots of files here and do something */ for (unsigned int i = 0; i < paths.GetCount(); ++i) { - _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i])), true); + shared_ptr<Content> c = content_factory (_film, wx_to_std (paths[i])); + shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c); + if (ic) { + ic->set_video_frame_rate (24); + } + _film->examine_and_add_content (c, true); } d->Destroy (); |