summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TO_PORT1
-rw-r--r--src/wx/content_panel.cc7
2 files changed, 6 insertions, 2 deletions
diff --git a/TO_PORT b/TO_PORT
index 6f3ca0aef..35fbd11eb 100644
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,2 +1 @@
-22ff18bc9fb57419cbc81da553effd59638b488f
0d4ab6d2536a037a1c6699a4672adfb42294320e
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 ();