Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index ca8bd380f1c6259821a46129e84ca684cda830b1..5262064af797313feb97c2f0dceab35bc946c251 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -26,12 +26,10 @@
 #include "job.h"
 #include "frame_rate_change.h"
 #include "exceptions.h"
-#include "safe_stringstream.h"
 #include "image_filename_sorter.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -40,7 +38,6 @@ using std::string;
 using std::cout;
 using std::list;
 using boost::shared_ptr;
-using boost::make_shared;
 
 ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
        : Content (film)
@@ -50,17 +47,7 @@ ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
        if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
                _paths.push_back (p);
        } else {
-               for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
-                       if (boost::filesystem::is_regular_file (i->path()) && valid_image_file (i->path())) {
-                               _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(), ImageFilenameSorter ());
+               _path_to_scan = p;
        }
 
        set_default_colour_conversion ();
@@ -103,10 +90,10 @@ ImageContent::technical_summary () const
 }
 
 void
-ImageContent::as_xml (xmlpp::Node* node) const
+ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
        node->add_child("Type")->add_child_text ("Image");
-       Content::as_xml (node);
+       Content::as_xml (node, with_paths);
 
        if (video) {
                video->as_xml (node);
@@ -116,12 +103,32 @@ ImageContent::as_xml (xmlpp::Node* node) const
 void
 ImageContent::examine (shared_ptr<Job> job)
 {
+       if (_path_to_scan) {
+               job->sub (_("Scanning image files"));
+               int n = 0;
+               for (boost::filesystem::directory_iterator i(*_path_to_scan); i != boost::filesystem::directory_iterator(); ++i) {
+                       if (boost::filesystem::is_regular_file (i->path()) && valid_image_file (i->path())) {
+                               _paths.push_back (i->path ());
+                       }
+                       ++n;
+                       if ((n % 1000) == 0) {
+                               job->set_progress_unknown ();
+                       }
+               }
+
+               if (_paths.empty()) {
+                       throw FileError (_("No valid image files were found in the folder."), *_path_to_scan);
+               }
+
+               sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
+       }
+
        Content::examine (job);
 
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
 
-       shared_ptr<ImageExaminer> examiner = make_shared<ImageExaminer> (film, shared_from_this(), job);
+       shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
        video->take_from_examiner (examiner);
        set_default_colour_conversion ();
 }
@@ -138,11 +145,9 @@ ImageContent::full_length () const
 string
 ImageContent::identifier () const
 {
-       SafeStringStream s;
-       s << Content::identifier();
-       s << "_" << video->identifier ();
-       s << "_" << video->length();
-       return s.str ();
+       char buffer[256];
+       snprintf (buffer, sizeof(buffer), "%s_%s_%" PRId64, Content::identifier().c_str(), video->identifier().c_str(), video->length());
+       return buffer;
 }
 
 bool