Merge still/moving image classes.

[dcpomatic.git] / src / wx / film_editor.cc

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 9cf840614535a7847d774977d3cdb2d396039788..b3d28db5fcd823fa8918c70a18ffd98421d544b7 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -36,8 +36,7 @@
 #include "lib/filter.h"
 #include "lib/ratio.h"
 #include "lib/config.h"
-#include "lib/still_image_content.h"
-#include "lib/moving_image_content.h"
+#include "lib/image_content.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/sndfile_content.h"
 #include "lib/dcp_content_type.h"
@@ -761,8 +760,8 @@ FilmEditor::content_add_folder_clicked ()
        }
 
        _film->examine_and_add_content (
-               shared_ptr<MovingImageContent> (
-                       new MovingImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ())))
+               shared_ptr<ImageContent> (
+                       new ImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ())))
                        )
                );
 }