C++11 and whitespace cleanups.

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 5262064af797313feb97c2f0dceab35bc946c251..9464babd4656fe61f3aa65fa6bfd7775f095b334 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.
 
@@ -18,34 +18,38 @@
 
 */
 
-#include "image_content.h"
-#include "video_content.h"
-#include "image_examiner.h"
+
 #include "compose.hpp"
+#include "exceptions.h"
 #include "film.h"
-#include "job.h"
 #include "frame_rate_change.h"
-#include "exceptions.h"
+#include "image_content.h"
+#include "image_examiner.h"
 #include "image_filename_sorter.h"
+#include "job.h"
+#include "video_content.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
-using std::string;
+
 using std::cout;
 using std::list;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+using namespace dcpomatic;
+
 
-ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
-       : Content (film)
+ImageContent::ImageContent (boost::filesystem::path p)
 {
-       video.reset (new VideoContent (this));
+       video = make_shared<VideoContent>(this);
 
        if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
-               _paths.push_back (p);
+               add_path (p);
        } else {
                _path_to_scan = p;
        }
@@ -54,12 +58,13 @@ 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)
+ImageContent::ImageContent (cxml::ConstNodePtr node, int version)
+       : Content (node)
 {
        video = VideoContent::from_xml (this, node, version);
 }
 
+
 string
 ImageContent::summary () const
 {
@@ -74,6 +79,7 @@ ImageContent::summary () const
        return s;
 }
 
+
 string
 ImageContent::technical_summary () const
 {
@@ -89,6 +95,7 @@ ImageContent::technical_summary () const
        return s;
 }
 
+
 void
 ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
@@ -100,15 +107,17 @@ ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const
        }
 }
 
+
 void
-ImageContent::examine (shared_ptr<Job> job)
+ImageContent::examine (shared_ptr<const Film> film, 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 ());
+               for (auto i: boost::filesystem::directory_iterator(*_path_to_scan)) {
+                       if (boost::filesystem::is_regular_file(i.path()) && valid_image_file (i.path())) {
+                               paths.push_back (i.path());
                        }
                        ++n;
                        if ((n % 1000) == 0) {
@@ -116,32 +125,37 @@ ImageContent::examine (shared_ptr<Job> job)
                        }
                }
 
-               if (_paths.empty()) {
+               if (paths.empty()) {
                        throw FileError (_("No valid image files were found in the folder."), *_path_to_scan);
                }
 
-               sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
+               sort (paths.begin(), paths.end(), ImageFilenameSorter());
+               set_paths (paths);
        }
 
-       Content::examine (job);
+       Content::examine (film, job);
 
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-
-       shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
+       auto examiner = make_shared<ImageExaminer>(film, shared_from_this(), job);
        video->take_from_examiner (examiner);
        set_default_colour_conversion ();
 }
 
+
 DCPTime
-ImageContent::full_length () const
+ImageContent::full_length (shared_ptr<const Film> film) const
 {
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       FrameRateChange const frc (active_video_frame_rate(), film->video_frame_rate());
-       return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
+       FrameRateChange const frc (film, shared_from_this());
+       return DCPTime::from_frames (llrint(video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
 }
 
+
+DCPTime
+ImageContent::approximate_length () const
+{
+       return DCPTime::from_frames (video->length_after_3d_combine(), 24);
+}
+
+
 string
 ImageContent::identifier () const
 {
@@ -150,16 +164,18 @@ ImageContent::identifier () const
        return buffer;
 }
 
+
 bool
 ImageContent::still () const
 {
        return number_of_paths() == 1;
 }
 
+
 void
 ImageContent::set_default_colour_conversion ()
 {
-       BOOST_FOREACH (boost::filesystem::path i, _paths) {
+       for (auto i: paths()) {
                if (valid_j2k_file (i)) {
                        /* We default to no colour conversion if we have JPEG2000 files */
                        video->unset_colour_conversion ();
@@ -178,9 +194,10 @@ ImageContent::set_default_colour_conversion ()
        }
 }
 
+
 void
-ImageContent::add_properties (list<UserProperty>& p) const
+ImageContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
 {
-       Content::add_properties (p);
+       Content::add_properties (film, p);
        video->add_properties (p);
 }