Merge master.

[dcpomatic.git] / src / lib / piece.h

diff --git a/src/lib/piece.h b/src/lib/piece.h
index 76df909ff361ba8c43e48ee42097071e50f1424e..976409381d3a8744c69f5f14e53f67a5ca688e08 100644 (file)
--- a/src/lib/piece.h
+++ b/src/lib/piece.h
@@ -25,41 +25,19 @@
 
 class Content;
 class Decoder;
-class Piece;
-class Image;
-class Player;
-
-struct IncomingVideo
-{
-public:
-       boost::weak_ptr<Piece> weak_piece;
-       boost::shared_ptr<const Image> image;
-       Eyes eyes;
-       bool same;
-       VideoContent::Frame frame;
-       Time extra;
-};
 
 class Piece
 {
 public:
-       Piece (boost::shared_ptr<Content> c);
-       Piece (boost::shared_ptr<Content> c, boost::shared_ptr<Decoder> d);
-       void set_repeat (IncomingVideo video, int num);
-       void reset_repeat ();
-       bool repeating () const;
-       void repeat (Player* player);
-
+       Piece (boost::shared_ptr<Content> c, boost::shared_ptr<Decoder> d, FrameRateChange f)
+               : content (c)
+               , decoder (d)
+               , frc (f)
+       {}
+       
        boost::shared_ptr<Content> content;
        boost::shared_ptr<Decoder> 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