X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_encoder.cc;h=51b9963bc02a168d1988120f586b93625faa0769;hb=19a7c5e93d72cf40a70e87c840b6d009aa8d0d1b;hp=2331eb52a8871241ba3ce58a87a3a99348a7aebf;hpb=5a820bb8fae34591be5ac6d19a73461b9dab532a;p=dcpomatic.git diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc index 2331eb52a..51b9963bc 100644 --- a/src/lib/subtitle_encoder.cc +++ b/src/lib/subtitle_encoder.cc @@ -56,10 +56,10 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr film, shared_ptr j , _reel_index (0) , _length (film->length()) { - _player->set_play_referenced (); - _player->set_ignore_video (); - _player->set_ignore_audio (); - _player->Text.connect (boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4)); + _player.set_play_referenced(); + _player.set_ignore_video(); + _player.set_ignore_audio(); + _player.Text.connect(boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4)); string const extension = film->interop() ? ".xml" : ".mxf"; @@ -99,7 +99,7 @@ SubtitleEncoder::go () _reel_index = 0; - while (!_player->pass()) {} + while (!_player.pass()) {} int reel = 0; for (auto& i: _assets) { @@ -119,7 +119,7 @@ SubtitleEncoder::go () } if (!_film->interop() || _include_font) { - for (auto j: _player->get_subtitle_fonts()) { + for (auto j: _player.get_subtitle_fonts()) { i.first->add_font(j->id(), j->data().get_value_or(_default_font)); } }