Quell config-save warning when we're only trying to save history.

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 08b9fd6ae475a364dd367f48274ef28e23ebf5d0..9e0bb09b5925a0a14f76f9afce703c7fb5b38ea7 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,7 +27,6 @@
 #include "frame_rate_change.h"
 #include "exceptions.h"
 #include "image_filename_sorter.h"
-#include <locked_sstream.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
@@ -38,6 +37,7 @@
 using std::string;
 using std::cout;
 using std::list;
+using std::vector;
 using boost::shared_ptr;
 
 ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
@@ -46,19 +46,9 @@ ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
        video.reset (new VideoContent (this));
 
        if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
-               _paths.push_back (p);
+               add_path (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 ();
@@ -101,10 +91,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);
@@ -114,6 +104,28 @@ ImageContent::as_xml (xmlpp::Node* node) const
 void
 ImageContent::examine (shared_ptr<Job> job)
 {
+       if (_path_to_scan) {
+               job->sub (_("Scanning image files"));
+               vector<boost::filesystem::path> paths;
+               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());
+               set_paths (paths);
+       }
+
        Content::examine (job);
 
        shared_ptr<const Film> film = _film.lock ();
@@ -136,11 +148,9 @@ ImageContent::full_length () const
 string
 ImageContent::identifier () const
 {
-       locked_stringstream 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
@@ -152,7 +162,7 @@ ImageContent::still () const
 void
 ImageContent::set_default_colour_conversion ()
 {
-       BOOST_FOREACH (boost::filesystem::path i, _paths) {
+       BOOST_FOREACH (boost::filesystem::path i, paths()) {
                if (valid_j2k_file (i)) {
                        /* We default to no colour conversion if we have JPEG2000 files */
                        video->unset_colour_conversion ();