diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-02-04 17:19:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-02-04 17:19:34 +0100 |
| commit | bcf5e20e86afe1fb521aab8b3198d29f68b810da (patch) | |
| tree | de76c50a39208145dcf64fcbe55e521a89fb0fef /src/lib/player.cc | |
| parent | 3b50beca67cc53f15ef736398c549e0b5d1c9d12 (diff) | |
C++11 tidying.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index b696f04c1..59e377303 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -775,14 +775,14 @@ Player::open_subtitles_for_frame (DCPTime time) const } /* String subtitles (rendered to an image) */ - if (!j.string.empty ()) { - list<PositionImage> s = render_text (j.string, j.fonts, _video_container_size, time, vfr); + if (!j.string.empty()) { + auto s = render_text (j.string, j.fonts, _video_container_size, time, vfr); copy (s.begin(), s.end(), back_inserter (captions)); } } - if (captions.empty ()) { - return optional<PositionImage> (); + if (captions.empty()) { + return {}; } return merge (captions); |