projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index c84ba7d29019c3f0575170678254c4649f27c97d..20f32c05dc0310c6d14b2a5d30758711c8218e1d 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-38,7
+38,8
@@
using std::string;
using std::cout;
using std::list;
using std::vector;
using std::cout;
using std::list;
using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
+using namespace dcpomatic;
ImageContent::ImageContent (boost::filesystem::path p)
{
ImageContent::ImageContent (boost::filesystem::path p)
{
@@
-139,6
+140,12
@@
ImageContent::full_length (shared_ptr<const Film> film) const
return DCPTime::from_frames (llrint(video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
}
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
{
string
ImageContent::identifier () const
{
@@
-176,8
+183,8
@@
ImageContent::set_default_colour_conversion ()
}
void
}
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);
}
video->add_properties (p);
}