projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add basic windowed-sinc audio filters.
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index 6acf0bab924001eaa5b51e1d1349ce134e5e719c..70d777bca11f6e52a466dbf44414b7a1ab048163 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-20,11
+20,11
@@
#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 "frame_rate_change.h"
#include "compose.hpp"
#include "film.h"
#include "job.h"
#include "frame_rate_change.h"
+#include "exceptions.h"
#include "i18n.h"
#include "i18n.h"
@@
-55,7
+55,7
@@
ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
}
}
-ImageContent::ImageContent (shared_ptr<const Film> f,
shared_ptr<const cxml::Node>
node, int version)
+ImageContent::ImageContent (shared_ptr<const Film> f,
cxml::ConstNodePtr
node, int version)
: Content (f, node)
, VideoContent (f, node, version)
{
: Content (f, node)
, VideoContent (f, node, version)
{
@@
-109,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 (
VideoContent::Fra
me len)
+ImageContent::set_video_length (
ContentTi
me len)
{
{
boost::mutex::scoped_lock lm (_mutex);
{
{
boost::mutex::scoped_lock lm (_mutex);
@@
-125,14
+123,12
@@
ImageContent::set_video_length (VideoContent::Frame len)
signal_changed (ContentProperty::LENGTH);
}
signal_changed (ContentProperty::LENGTH);
}
-Time
+
DCP
Time
ImageContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
assert (film);
ImageContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
assert (film);
-
- FrameRateChange frc (video_frame_rate(), film->video_frame_rate ());
- return video_length_after_3d_combine() * frc.factor() * TIME_HZ / video_frame_rate();
+ return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
}
string
}
string
@@
-140,7
+136,7
@@
ImageContent::identifier () const
{
stringstream s;
s << VideoContent::identifier ();
{
stringstream s;
s << VideoContent::identifier ();
- s << "_" << video_length();
+ s << "_" << video_length()
.get()
;
return s.str ();
}
return s.str ();
}