summaryrefslogtreecommitdiff
path: root/src/lib/content_factory.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-19 16:08:29 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-19 16:08:29 +0100
commitbd453939da140ea994282e1c167ea5f8d02e2d94 (patch)
tree8cdfbacdc9f33f82ab13895a0ed5207fd0bc8fa1 /src/lib/content_factory.cc
parent56506a1993f402fe889a650faa3de2e265632498 (diff)
Spacing tweaks; rename ImageMagick -> StillImage.
Diffstat (limited to 'src/lib/content_factory.cc')
-rw-r--r--src/lib/content_factory.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index cf45b6aa6..bf447641d 100644
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -19,7 +19,7 @@
#include <libcxml/cxml.h>
#include "ffmpeg_content.h"
-#include "imagemagick_content.h"
+#include "still_image_content.h"
#include "sndfile_content.h"
using std::string;
@@ -34,8 +34,8 @@ 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 == "Sndfile") {
content.reset (new SndfileContent (film, node));
}