Hand-apply 22c79dac4ae2b01b448cc5886f8e8ff3a0cfb69b from master; fix broken still...

diff --git a/TO_PORT b/TO_PORT
index 6f3ca0aef25ea3508ea3c1ffdf94c5be7bd6d24f..35fbd11eb4c1a4c9d9f9ec682c531946cc4aee76 100644 (file)
--- 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 4d73a608dcb2b329f7c262c95d2561f02b9265a9..2dc75f8c24753e18a18f6833e7001b892ff2092b 100644 (file)
--- 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 ();