*/
-#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 "util.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 std::make_shared;
+using std::shared_ptr;
+using std::string;
using std::vector;
-using boost::shared_ptr;
+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)) {
add_path (p);
}
-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);
+ video = VideoContent::from_xml (this, node, version, VideoRange::FULL);
}
+
string
ImageContent::summary () const
{
return s;
}
+
string
ImageContent::technical_summary () const
{
return s;
}
+
void
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) {
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));
- video->take_from_examiner (examiner);
+ auto examiner = make_shared<ImageExaminer>(film, shared_from_this(), job);
+ video->take_from_examiner(film, 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
{
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 ();
}
}
+
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);
}