diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-04-25 16:33:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-04-25 16:33:16 +0100 |
| commit | 306e2f021410d2184a3945b1e374b563104b3ea8 (patch) | |
| tree | 136cd1e130b79b2bc1ee2327807381f4d7d3cf8f | |
| parent | 11efa93e15b694b8ea6f0a2bc68c87503cc570bb (diff) | |
Fix preview update when fade is changed (#1531).
| -rw-r--r-- | src/lib/player_video.cc | 5 | ||||
| -rw-r--r-- | src/lib/player_video.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 5c287dc92..e36eb1984 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -105,10 +105,10 @@ PlayerVideo::set_text (PositionImage image) shared_ptr<Image> PlayerVideo::image (function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const { - /* XXX: this assumes that image() and prepare() are only ever called with the same parameters (except crop, inter size, out size) */ + /* XXX: this assumes that image() and prepare() are only ever called with the same parameters (except crop, inter size, out size, fade) */ boost::mutex::scoped_lock lm (_mutex); - if (!_image || _crop != _image_crop || _inter_size != _image_inter_size || _out_size != _image_out_size) { + if (!_image || _crop != _image_crop || _inter_size != _image_inter_size || _out_size != _image_out_size || _fade != _image_fade) { make_image (pixel_format, aligned, fast); } return _image; @@ -127,6 +127,7 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, b _image_crop = _crop; _image_inter_size = _inter_size; _image_out_size = _out_size; + _image_fade = _fade; pair<shared_ptr<Image>, int> prox = _in->image (_inter_size); shared_ptr<Image> im = prox.first; diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 928dfc690..c38d60641 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -133,6 +133,8 @@ private: mutable dcp::Size _image_inter_size; /** _out_size that was used to make _image */ mutable dcp::Size _image_out_size; + /** _fade that was used to make _image */ + mutable boost::optional<double> _image_fade; }; #endif |