projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index b05fa6b8d69ce8599503e3d9b3c1e6c5179e6c9a..a7f951beaca4e98f5213d397408c19f9a79e24ec 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-110,7
+110,7
@@
ImageContent::examine (shared_ptr<Job> job)
}
void
}
void
-ImageContent::set_video_length (Video
Content::
Frame len)
+ImageContent::set_video_length (VideoFrame len)
{
{
boost::mutex::scoped_lock lm (_mutex);
{
{
boost::mutex::scoped_lock lm (_mutex);
@@
-120,13
+120,13
@@
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);
- FrameRateC
onversion
frc (video_frame_rate(), film->video_frame_rate ());
+ FrameRateC
hange
frc (video_frame_rate(), film->video_frame_rate ());
return video_length() * frc.factor() * TIME_HZ / video_frame_rate();
}
return video_length() * frc.factor() * TIME_HZ / video_frame_rate();
}
@@
-144,3
+144,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);
+}
+