Configurable window arrangement in player dual-screen mode.

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 57212c589155e699d93a5528d7a02dd5d294dbb4..9e0bb09b5925a0a14f76f9afce703c7fb5b38ea7 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,7 +26,6 @@
 #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>
@@ -36,27 +36,19 @@
 
 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)
        : Content (film)
 {
-       video.reset (new VideoContent (this, film));
+       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 ();
@@ -66,7 +58,7 @@ ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
 ImageContent::ImageContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
 {
-       video.reset (new VideoContent (this, film, node, version));
+       video = VideoContent::from_xml (this, node, version);
 }
 
 string
@@ -99,16 +91,41 @@ 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);
-       video->as_xml (node);
+       Content::as_xml (node, with_paths);
+
+       if (video) {
+               video->as_xml (node);
+       }
 }
 
 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 ();
@@ -131,11 +148,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
@@ -147,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 ();
@@ -165,3 +180,10 @@ ImageContent::set_default_colour_conversion ()
                video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion);
        }
 }
+
+void
+ImageContent::add_properties (list<UserProperty>& p) const
+{
+       Content::add_properties (p);
+       video->add_properties (p);
+}