X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.cc;h=eb02ba17be9a2eb5a6abc48b814d90dae8b19836;hb=7a68de9aa2aba678f9ae9c6f9e11d9fc20c1c8e2;hp=271180d5d0970521e58e45f45fa087131abca9d3;hpb=4337694dfd488e88f56b63898ad35ce8ce9bb3c3;p=dcpomatic.git diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 271180d5d..eb02ba17b 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -160,21 +160,10 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptrsecond) { - if (i->second->image) { - i->first->add_image_subtitle ( + if (i->first->unknown_to (i->second->id)) { + i->first->set_subtitle_to ( i->second->id, - ContentTimePeriod ( - i->second->time, - ContentTime::from_frames (video_length(), video_frame_rate().get_value_or (24)) - ) - ); - } else { - i->first->add_text_subtitle ( - i->second->id, - ContentTimePeriod ( - i->second->time, - ContentTime::from_frames (video_length(), video_frame_rate().get_value_or (24)) - ) + ContentTime::from_frames (video_length(), video_frame_rate().get_value_or (24)) ); } }