X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpiece.h;h=cebc3fb1416dc1dcd72d852f7efab1369fa993f7;hb=c3e969b4951ab2dc14cd535d154bc2fdd81ff8c5;hp=76df909ff361ba8c43e48ee42097071e50f1424e;hpb=d19ba00f1995495977bdee206305c42a96eb0f57;p=dcpomatic.git diff --git a/src/lib/piece.h b/src/lib/piece.h index 76df909ff..cebc3fb14 100644 --- a/src/lib/piece.h +++ b/src/lib/piece.h @@ -21,45 +21,22 @@ #define DCPOMATIC_PIECE_H #include "types.h" -#include "video_content.h" class Content; class Decoder; -class Piece; -class Image; -class Player; - -struct IncomingVideo -{ -public: - boost::weak_ptr weak_piece; - boost::shared_ptr image; - Eyes eyes; - bool same; - VideoContent::Frame frame; - Time extra; -}; class Piece { public: - Piece (boost::shared_ptr c); - Piece (boost::shared_ptr c, boost::shared_ptr d); - void set_repeat (IncomingVideo video, int num); - void reset_repeat (); - bool repeating () const; - void repeat (Player* player); + Piece (boost::shared_ptr c, boost::shared_ptr d, FrameRateChange f) + : content (c) + , decoder (d) + , frc (f) + {} boost::shared_ptr content; boost::shared_ptr decoder; - /** Time of the last video we emitted relative to the start of the DCP */ - Time video_position; - /** Time of the last audio we emitted relative to the start of the DCP */ - Time audio_position; - - IncomingVideo repeat_video; - int repeat_to_do; - int repeat_done; + FrameRateChange frc; }; #endif