Replace calls to Position::end.

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

diff --git a/src/lib/piece.h b/src/lib/piece.h
index 76df909ff361ba8c43e48ee42097071e50f1424e..0adc8fb32454894ea2e7758f6a0dccea1d106cdb 100644 (file)
--- a/src/lib/piece.h
+++ b/src/lib/piece.h
@@ -1,65 +1,52 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #ifndef DCPOMATIC_PIECE_H
 #define DCPOMATIC_PIECE_H
 
+#include "audio_stream.h"
+#include "dcpomatic_time.h"
+#include "frame_rate_change.h"
 #include "types.h"
-#include "video_content.h"
 
 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);
+
+       void update_pull_to (dcpomatic::DCPTime& pull_to) const;
+       void set_last_push_end (AudioStreamPtr stream, dcpomatic::DCPTime last_push_end);
+
+       dcpomatic::DCPTime position () const;
+       dcpomatic::DCPTime end (boost::shared_ptr<const Film> film) const;
 
-       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;
+private:
+       std::vector<boost::shared_ptr<Content> > _content;
+       std::vector<boost::shared_ptr<Decoder> > _decoder;
+       FrameRateChange _frc;
+       bool _done;
 
-       IncomingVideo repeat_video;
-       int repeat_to_do;
-       int repeat_done;
+       std::map<AudioStreamPtr, dcpomatic::DCPTime> _stream_last_push_end;
 };
 
 #endif