projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added some notes on DVD-o-matic's files to the manual.
[dcpomatic.git]
/
src
/
lib
/
video_content.cc
diff --git
a/src/lib/video_content.cc
b/src/lib/video_content.cc
index 819333227a6e42c4a52d41a807cb338ddce45f48..a157b05993ca4b2532d0dd5fc8168436c2048a69 100644
(file)
--- a/
src/lib/video_content.cc
+++ b/
src/lib/video_content.cc
@@
-73,16
+73,6
@@
VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
}
}
}
}
-VideoContent::VideoContent (VideoContent const & o)
- : Content (o)
- , _video_length (o._video_length)
- , _video_size (o._video_size)
- , _video_frame_rate (o._video_frame_rate)
- , _ratio (o._ratio)
-{
-
-}
-
void
VideoContent::as_xml (xmlpp::Node* node) const
{
void
VideoContent::as_xml (xmlpp::Node* node) const
{
@@
-107,14
+97,14
@@
VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
libdcp::Size const vs = d->video_size ();
float const vfr = d->video_frame_rate ();
libdcp::Size const vs = d->video_size ();
float const vfr = d->video_frame_rate ();
-
{
-
boost::mutex::scoped_lock lm (_mutex);
-
_video_size = vs;
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _video_size = vs;
_video_frame_rate = vfr;
_video_frame_rate = vfr;
-
}
-
-
signal_changed (VideoContentProperty::VIDEO_SIZE);
-
signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+ }
+
+ signal_changed (VideoContentProperty::VIDEO_SIZE);
+ signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
}
}