Remove unnecessary VideoFrame class.

[dcpomatic.git] / src / lib / player.cc

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 7c2048489db81f5c9950aee6004430ebebde2f49..14625b85ac53007a06c6ee040331ef0779602ca0 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -519,6 +519,7 @@ Player::pass ()
        }
 
        if (!earliest) {
+               /* XXX: fill up to the length of Playlist with black / silence */
                return true;
        }
 
@@ -565,7 +566,7 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
        }
 
        /* Time and period of the frame we will emit */
-       DCPTime const time = content_video_to_dcp (piece, video.frame.index());
+       DCPTime const time = content_video_to_dcp (piece, video.frame);
        DCPTimePeriod const period (time, time + DCPTime::from_frames (1, _film->video_frame_rate()));
 
        /* Discard if it's outside the content's period */
@@ -618,12 +619,12 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
                new PlayerVideo (
                        video.image,
                        piece->content->video->crop (),
-                       piece->content->video->fade (video.frame.index()),
+                       piece->content->video->fade (video.frame),
                        piece->content->video->scale().size (
                                piece->content->video, _video_container_size, _film->frame_size ()
                                ),
                        _video_container_size,
-                       video.frame.eyes(),
+                       video.eyes,
                        video.part,
                        piece->content->video->colour_conversion ()
                        )