Add another piece wrapper.

diff --git a/src/lib/piece.h b/src/lib/piece.h
index d1437ddfc6a044d4ac812c1b4d505e49903376d1..7fcf00dab05c4fbd97784bf5f7bd54033770464d 100644 (file)
--- 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 216e68abd8cae901be7d9ff411614a5799d34543..898298d4ef1ef6a602729f7cbdbcba37a6d97175 100644 (file)
--- 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,