projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/carl/src/dcpomatic
[dcpomatic.git]
/
src
/
lib
/
video_content.cc
diff --git
a/src/lib/video_content.cc
b/src/lib/video_content.cc
index d3ba6c1ab1f3d50d89806290b8eb8ed12b2b54aa..8cb30546371a7c43a19a3afd1529c7941ffbb0c4 100644
(file)
--- a/
src/lib/video_content.cc
+++ b/
src/lib/video_content.cc
@@
-234,6
+234,10
@@
VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
optional<double> const ar = d->sample_aspect_ratio ();
bool const yuv = d->yuv ();
optional<double> const ar = d->sample_aspect_ratio ();
bool const yuv = d->yuv ();
+ ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
+ ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
+ ChangeSignaller<Content> cc3 (_parent, ContentProperty::LENGTH);
+
{
boost::mutex::scoped_lock lm (_mutex);
_size = vs;
{
boost::mutex::scoped_lock lm (_mutex);
_size = vs;
@@
-256,10
+260,6
@@
VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
if (d->video_frame_rate()) {
_parent->set_video_frame_rate (d->video_frame_rate().get());
}
if (d->video_frame_rate()) {
_parent->set_video_frame_rate (d->video_frame_rate().get());
}
-
- _parent->signal_changed (VideoContentProperty::SIZE);
- _parent->signal_changed (VideoContentProperty::SCALE);
- _parent->signal_changed (ContentProperty::LENGTH);
}
/** @return string which includes everything about how this content looks */
}
/** @return string which includes everything about how this content looks */