X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=e800628c161dec79fdb68dc5a4fb8645353ff930;hb=ef4cd174472dc1c4694d4451dc60b9292c60666b;hp=ed9a9e7699da3c22fcef43a854b5c4b9c2edf316;hpb=af474db6af17d468b42fbae8bd4c3e80dcfd0588;p=dcpomatic.git

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index ed9a9e769..e800628c1 100644
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -19,8 +19,7 @@
 
 #include <libcxml/cxml.h>
 #include "ffmpeg_content.h"
-#include "still_image_content.h"
-#include "moving_image_content.h"
+#include "image_content.h"
 #include "sndfile_content.h"
 #include "util.h"
 
@@ -36,10 +35,8 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node)
 	
 	if (type == "FFmpeg") {
 		content.reset (new FFmpegContent (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 == "Image") {
+		content.reset (new ImageContent (film, node));
 	} else if (type == "Sndfile") {
 		content.reset (new SndfileContent (film, node));
 	}
@@ -53,7 +50,7 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
 	shared_ptr<Content> content;
 		
 	if (valid_image_file (path)) {
-		content.reset (new StillImageContent (film, path));
+		content.reset (new ImageContent (film, path));
 	} else if (SndfileContent::valid_file (path)) {
 		content.reset (new SndfileContent (film, path));
 	} else {