diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-06-22 01:38:46 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-06-22 01:38:46 +0200 |
| commit | 77cfe09ac8cb11a088b164e83309ded5b46a2195 (patch) | |
| tree | c7d44508348a18919643efba1bf70f55aa32d35d | |
| parent | f06f74bb2c6f1ff322eeacf05d8d74cf90a832f8 (diff) | |
Add another piece wrapper.
| -rw-r--r-- | src/lib/piece.h | 5 | ||||
| -rw-r--r-- | src/lib/player.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/piece.h b/src/lib/piece.h index d1437ddfc..7fcf00dab 100644 --- a/src/lib/piece.h +++ b/src/lib/piece.h @@ -25,6 +25,7 @@ #include "dcpomatic_time.h" #include "frame_rate_change.h" #include "types.h" +#include "video_content.h" class Content; class Decoder; @@ -65,6 +66,10 @@ public: return max (dcpomatic::DCPTime(), dcpomatic::DCPTime(t - content->trim_start(), frc) + position()); } + Crop video_crop () const { + return content->video->crop (); + } + boost::shared_ptr<Content> content; boost::shared_ptr<Decoder> decoder; FrameRateChange frc; diff --git a/src/lib/player.cc b/src/lib/player.cc index 216e68abd..898298d4e 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -833,7 +833,7 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video) _last_video[wp].reset ( new PlayerVideo ( video.image, - piece->content->video->crop (), + piece->video_crop(), piece->content->video->fade (_film, video.frame), scale_for_display(piece->content->video->scaled_size(_film->frame_size()), _video_container_size, _film->frame_size()), _video_container_size, |