Hacks.

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

diff --git a/src/lib/imagemagick_content.cc b/src/lib/imagemagick_content.cc
index 2b7449a6e99870acc3471bbfdfe40644dc0221bb..2fd65ffa0d403d607fd7b2a835d9b71710516746 100644 (file)
--- a/src/lib/imagemagick_content.cc
+++ b/src/lib/imagemagick_content.cc
@@ -19,9 +19,10 @@
 
 #include <libcxml/cxml.h>
 #include "imagemagick_content.h"
-#include "imagemagick_decoder.h"
+#include "imagemagick_examiner.h"
 #include "config.h"
 #include "compose.hpp"
+#include "film.h"
 
 #include "i18n.h"
 
@@ -73,10 +74,10 @@ ImageMagickContent::examine (shared_ptr<Job> job)
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
        
-       shared_ptr<ImageMagickDecoder> decoder (new ImageMagickDecoder (film, shared_from_this()));
+       shared_ptr<ImageMagickExaminer> examiner (new ImageMagickExaminer (film, shared_from_this()));
 
        set_video_length (Config::instance()->default_still_length() * 24);
-       take_from_video_decoder (decoder);
+       take_from_video_examiner (examiner);
 }
 
 shared_ptr<Content>
@@ -86,7 +87,7 @@ ImageMagickContent::clone () const
 }
 
 void
-ImageMagickContent::set_video_length (ContentVideoFrame len)
+ImageMagickContent::set_video_length (VideoContent::Frame len)
 {
        {
                boost::mutex::scoped_lock lm (_mutex);