Merge branch 'master' into content-rework-take5

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

diff --git a/src/lib/imagemagick_content.cc b/src/lib/imagemagick_content.cc
index 806c8ac5d422e905a00a0a9e0a0db2f0d457f886..cb712b417fa3bb73f4b88649804ef6fe3c08a5e7 100644 (file)
--- a/src/lib/imagemagick_content.cc
+++ b/src/lib/imagemagick_content.cc
@@ -1,15 +1,25 @@
+#include <libcxml/cxml.h>
 #include "imagemagick_content.h"
 #include "compose.hpp"
 
 #include "i18n.h"
 
 using std::string;
+using boost::shared_ptr;
 
 ImageMagickContent::ImageMagickContent (boost::filesystem::path f)
        : Content (f)
        , VideoContent (f)
 {
+       /* XXX */
+       _video_length = 10 * 24;
+}
 
+ImageMagickContent::ImageMagickContent (shared_ptr<const cxml::Node> node)
+       : Content (node)
+       , VideoContent (node)
+{
+       
 }
 
 string