Add basic windowed-sinc audio filters.

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 2713280b4b7c83b1cc6d0560ab82fd89657abcd3..70d777bca11f6e52a466dbf44414b7a1ab048163 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,10 +20,11 @@
 #include <libcxml/cxml.h>
 #include "image_content.h"
 #include "image_examiner.h"
-#include "config.h"
 #include "compose.hpp"
 #include "film.h"
 #include "job.h"
+#include "frame_rate_change.h"
+#include "exceptions.h"
 
 #include "i18n.h"
 
@@ -44,15 +45,19 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
                                _paths.push_back (i->path ());
                        }
                }
-               
+
+               if (_paths.empty()) {
+                       throw FileError (_("No valid image files were found in the folder."), p);
+               }
+                               
                sort (_paths.begin(), _paths.end());
        }
 }
 
 
-ImageContent::ImageContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int)
+ImageContent::ImageContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
        : Content (f, node)
-       , VideoContent (f, node)
+       , VideoContent (f, node, version)
 {
        
 }
@@ -104,9 +109,7 @@ ImageContent::examine (shared_ptr<Job> job)
        assert (film);
        
        shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-
        take_from_video_examiner (examiner);
-       set_video_length (examiner->video_length ());
 }
 
 void
@@ -125,7 +128,7 @@ ImageContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
-       return DCPTime (video_length(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
+       return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
 }
 
 string
@@ -133,7 +136,7 @@ ImageContent::identifier () const
 {
        stringstream s;
        s << VideoContent::identifier ();
-       s << "_" << video_length();
+       s << "_" << video_length().get();
        return s.str ();
 }