projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove erroneous comment.
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index 6a6be2716c4bffc01ae067538676025c95a4e16f..05896dc0777e97d5234d6d36643ee2e47d0ad92c 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-19,6
+19,7
@@
*/
*/
+
#include "compose.hpp"
#include "exceptions.h"
#include "film.h"
#include "compose.hpp"
#include "exceptions.h"
#include "film.h"
@@
-64,6
+65,7
@@
ImageContent::ImageContent (cxml::ConstNodePtr node, int version)
video = VideoContent::from_xml (this, node, version);
}
video = VideoContent::from_xml (this, node, version);
}
+
string
ImageContent::summary () const
{
string
ImageContent::summary () const
{
@@
-78,6
+80,7
@@
ImageContent::summary () const
return s;
}
return s;
}
+
string
ImageContent::technical_summary () const
{
string
ImageContent::technical_summary () const
{
@@
-93,6
+96,7
@@
ImageContent::technical_summary () const
return s;
}
return s;
}
+
void
ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const
{
void
ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const
{
@@
-104,6
+108,7
@@
ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const
}
}
}
}
+
void
ImageContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
{
void
ImageContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
{
@@
-136,6
+141,7
@@
ImageContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
set_default_colour_conversion ();
}
set_default_colour_conversion ();
}
+
DCPTime
ImageContent::full_length (shared_ptr<const Film> film) const
{
DCPTime
ImageContent::full_length (shared_ptr<const Film> film) const
{
@@
-143,12
+149,14
@@
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);
}
DCPTime
ImageContent::approximate_length () const
{
return DCPTime::from_frames (video->length_after_3d_combine(), 24);
}
+
string
ImageContent::identifier () const
{
string
ImageContent::identifier () const
{
@@
-157,12
+165,14
@@
ImageContent::identifier () const
return buffer;
}
return buffer;
}
+
bool
ImageContent::still () const
{
return number_of_paths() == 1;
}
bool
ImageContent::still () const
{
return number_of_paths() == 1;
}
+
void
ImageContent::set_default_colour_conversion ()
{
void
ImageContent::set_default_colour_conversion ()
{
@@
-185,6
+195,7
@@
ImageContent::set_default_colour_conversion ()
}
}
}
}
+
void
ImageContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
{
void
ImageContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
{