summaryrefslogtreecommitdiff
path: root/src/lib/dcp_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-04-26 00:22:52 +0100
committerCarl Hetherington <cth@carlh.net>2018-04-26 00:22:52 +0100
commit131646786964241429888af6296e4ff089ce5900 (patch)
tree524a4c82b72af8b6f44eab24adc3e2c3ca5e3ab0 /src/lib/dcp_content.cc
parent59bf0ffd44300161bcf82f547413f1a58a7345f7 (diff)
Signal when streams change and rebuild player pieces when it happens.
Diffstat (limited to 'src/lib/dcp_content.cc')
-rw-r--r--src/lib/dcp_content.cc17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 7d9766a7c..b5209e2c7 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -155,16 +155,11 @@ DCPContent::examine (shared_ptr<Job> job)
video->take_from_examiner (examiner);
set_default_colour_conversion ();
- {
- boost::mutex::scoped_lock lm (_mutex);
-
- AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels()));
- audio->set_stream (as);
- AudioMapping m = as->mapping ();
- film()->make_audio_mapping_default (m);
- as->set_mapping (m);
- }
-
+ AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels()));
+ audio->set_stream (as);
+ AudioMapping m = as->mapping ();
+ film()->make_audio_mapping_default (m);
+ as->set_mapping (m);
signal_changed (AudioContentProperty::STREAMS);
bool has_subtitles = false;
@@ -202,6 +197,8 @@ DCPContent::examine (shared_ptr<Job> job)
signal_changed (DCPContentProperty::NAME);
}
+ signal_changed (AudioContentProperty::STREAMS);
+
video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D);
}