X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=84b0b75c9732a4cd47dc30e1698ee1a82335c675;hb=391d85619ac19a2a93696ddc35c222eb9bb5d9d6;hp=d7b37a8353fa5f04b63c58006a2a6c8eade95a1f;hpb=2c0478d2b33906845b9d910668b12fe3e8f03a7c;p=dcpomatic.git

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index d7b37a835..84b0b75c9 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -20,16 +20,17 @@
 #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 "safe_stringstream.h"
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
-using std::stringstream;
 using boost::shared_ptr;
 
 ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
@@ -44,13 +45,17 @@ 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 version)
+ImageContent::ImageContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
 	: Content (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
@@ -131,7 +134,7 @@ ImageContent::full_length () const
 string
 ImageContent::identifier () const
 {
-	stringstream s;
+	SafeStringStream s;
 	s << VideoContent::identifier ();
 	s << "_" << video_length().get();
 	return s.str ();