projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index 87276ce4dc92d6c5538139d8fb88988f1c22f8ea..84b0b75c9732a4cd47dc30e1698ee1a82335c675 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-20,16
+20,17
@@
#include <libcxml/cxml.h>
#include "image_content.h"
#include "image_examiner.h"
#include <libcxml/cxml.h>
#include "image_content.h"
#include "image_examiner.h"
-#include "config.h"
#include "compose.hpp"
#include "film.h"
#include "job.h"
#include "compose.hpp"
#include "film.h"
#include "job.h"
+#include "frame_rate_change.h"
+#include "exceptions.h"
+#include "safe_stringstream.h"
#include "i18n.h"
using std::string;
using std::cout;
#include "i18n.h"
using std::string;
using std::cout;
-using std::stringstream;
using boost::shared_ptr;
ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
using boost::shared_ptr;
ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
@@
-44,15
+45,19
@@
ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
_paths.push_back (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());
}
}
sort (_paths.begin(), _paths.end());
}
}
-ImageContent::ImageContent (shared_ptr<const Film> f,
shared_ptr<const cxml::Node> node, int
)
+ImageContent::ImageContent (shared_ptr<const Film> f,
cxml::ConstNodePtr node, int version
)
: Content (f, node)
: Content (f, node)
- , VideoContent (f, node)
+ , VideoContent (f, node
, version
)
{
}
{
}
@@
-104,13
+109,11
@@
ImageContent::examine (shared_ptr<Job> job)
assert (film);
shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
assert (film);
shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-
take_from_video_examiner (examiner);
take_from_video_examiner (examiner);
- set_video_length (examiner->video_length ());
}
void
}
void
-ImageContent::set_video_length (
VideoFra
me len)
+ImageContent::set_video_length (
ContentTi
me len)
{
{
boost::mutex::scoped_lock lm (_mutex);
{
{
boost::mutex::scoped_lock lm (_mutex);
@@
-125,17
+128,15
@@
ImageContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
assert (film);
{
shared_ptr<const Film> film = _film.lock ();
assert (film);
-
- FrameRateChange frc (video_frame_rate(), film->video_frame_rate ());
- return video_length() * frc.factor() * TIME_HZ / video_frame_rate();
+ return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
}
string
ImageContent::identifier () const
{
}
string
ImageContent::identifier () const
{
-
strings
tream s;
+
SafeStringS
tream s;
s << VideoContent::identifier ();
s << VideoContent::identifier ();
- s << "_" << video_length();
+ s << "_" << video_length()
.get()
;
return s.str ();
}
return s.str ();
}
@@
-144,3
+145,19
@@
ImageContent::still () const
{
return number_of_paths() == 1;
}
{
return number_of_paths() == 1;
}
+
+void
+ImageContent::set_video_frame_rate (float r)
+{
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ if (_video_frame_rate == r) {
+ return;
+ }
+
+ _video_frame_rate = r;
+ }
+
+ signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+}
+