Fix save/restore of encrypted option.

[dcpomatic.git] / src / lib / content_factory.cc

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index cf45b6aa6f4074aceed188b4a36d6089ab3de4c7..6ed01f174acb6e0068bdf9ca88d368a2de06455c 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -19,7 +19,8 @@
 
 #include <libcxml/cxml.h>
 #include "ffmpeg_content.h"
-#include "imagemagick_content.h"
+#include "still_image_content.h"
+#include "moving_image_content.h"
 #include "sndfile_content.h"
 
 using std::string;
@@ -34,8 +35,10 @@ content_factory (shared_ptr<const Film> film, shared_ptr<cxml::Node> node)
        
        if (type == "FFmpeg") {
                content.reset (new FFmpegContent (film, node));
-       } else if (type == "ImageMagick") {
-               content.reset (new ImageMagickContent (film, node));
+       } else if (type == "StillImage") {
+               content.reset (new StillImageContent (film, node));
+       } else if (type == "MovingImage") {
+               content.reset (new MovingImageContent (film, node));
        } else if (type == "Sndfile") {
                content.reset (new SndfileContent (film, node));
        }