diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-11 23:53:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-11 23:53:37 +0100 |
| commit | 707a603ae2eba082f6ba824a510295dfb213219b (patch) | |
| tree | e6168b1860fc06ce57c4d5a0f400112fc2257665 /src/lib/dcp_decoder.cc | |
| parent | 477eeb4343bbeb71317d7da8775530c0ec76972b (diff) | |
Fix missing preview of referenced DCPs; deciding whether to ignore DCP content is done in the player.
Diffstat (limited to 'src/lib/dcp_decoder.cc')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 5060b9a7f..1c3285d2d 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -68,7 +68,7 @@ DCPDecoder::pass () double const vfr = _dcp_content->video_frame_rate (); int64_t const frame = _next.frames_round (vfr); - if ((*_reel)->main_picture () && !_dcp_content->reference_video ()) { + if ((*_reel)->main_picture ()) { shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset (); shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset); shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset); @@ -88,7 +88,7 @@ DCPDecoder::pass () } } - if ((*_reel)->main_sound () && !_dcp_content->reference_audio ()) { + if ((*_reel)->main_sound ()) { int64_t const entry_point = (*_reel)->main_sound()->entry_point (); shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->asset()->get_frame (entry_point + frame); uint8_t const * from = sf->data (); @@ -106,7 +106,7 @@ DCPDecoder::pass () audio (_dcp_content->audio_stream(), data, _next); } - if ((*_reel)->main_subtitle () && !_dcp_content->reference_subtitle ()) { + if ((*_reel)->main_subtitle ()) { int64_t const entry_point = (*_reel)->main_subtitle()->entry_point (); list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->subtitle_asset()->subtitles_during ( dcp::Time (entry_point + frame, vfr, vfr), |