Rename ContentVideo -> PieceVideo and pass video through Piece.

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

diff --git a/src/lib/piece.h b/src/lib/piece.h
index 8f4b91f226119f0bcc7f5d9d8f6cadfd406a7cb7..2d9272bd630d952fa13542e6b3e996d06d8dbbe9 100644 (file)
--- a/src/lib/piece.h
+++ b/src/lib/piece.h
@@ -24,10 +24,12 @@
 
 
 #include "audio_stream.h"
-#include "content_video.h"
 #include "dcpomatic_time.h"
+#include "font_data.h"
 #include "frame_rate_change.h"
+#include "piece_video.h"
 #include "types.h"
+#include <boost/signals2.hpp>
 #include <map>
 
 
@@ -35,19 +37,20 @@ class Content;
 class Decoder;
 class PlayerVideo;
 struct overlap_video_test1;
+struct check_reuse_old_data_test;
 
 
 class Piece
 {
 public:
-       Piece (std::shared_ptr<Content> c, std::shared_ptr<Decoder> d, FrameRateChange f);
+       Piece (std::weak_ptr<const Film> film, std::shared_ptr<Content> c, std::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 content_video_to_dcp (Frame f) const;
-       dcpomatic::DCPTime resampled_audio_to_dcp (Frame f, std::shared_ptr<const Film> film) const;
-       dcpomatic::ContentTime dcp_to_content_time (dcpomatic::DCPTime t, std::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime resampled_audio_to_dcp (Frame f) const;
+       dcpomatic::ContentTime dcp_to_content_time (dcpomatic::DCPTime t) const;
        boost::optional<dcpomatic::DCPTime> content_time_to_dcp (std::shared_ptr<const Content> content, dcpomatic::ContentTime t) const;
 
        void pass ();
@@ -60,28 +63,41 @@ public:
        }
 
        dcpomatic::DCPTime position () const;
-       dcpomatic::DCPTime end (std::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime end () const;
+       dcpomatic::DCPTimePeriod period () const;
 
-       std::shared_ptr<PlayerVideo> player_video (ContentVideo video, std::shared_ptr<const Film> film, dcp::Size container_size) const;
+       std::shared_ptr<PlayerVideo> player_video (PieceVideo video, dcp::Size container_size) const;
 
-       int resampled_audio_frame_rate (std::shared_ptr<const Film> film) const;
+       int resampled_audio_frame_rate () const;
        double audio_gain () const;
        bool reference_dcp_audio () const;
 
        std::shared_ptr<Decoder> decoder_for (std::shared_ptr<Content> content) const;
 
-       void seek (std::shared_ptr<const Film> film, dcpomatic::DCPTime time, bool accurate);
-       boost::optional<dcpomatic::DCPTime> decoder_before(std::shared_ptr<const Film> film, boost::optional<dcpomatic::DCPTime> time);
+       void seek (dcpomatic::DCPTime time, bool accurate);
+       boost::optional<dcpomatic::DCPTime> decoder_before(boost::optional<dcpomatic::DCPTime> time);
+       std::vector<dcpomatic::FontData> fonts () const;
 
-       std::shared_ptr<Decoder> decoder;
-       boost::optional<dcpomatic::DCPTimePeriod> ignore_video;
+       void set_ignore_video (boost::optional<dcpomatic::DCPTimePeriod> period) {
+               _ignore_video = period;
+       }
+
+       bool ignore_video_at (dcpomatic::DCPTime time) const;
+
+       boost::signals2::signal<void (PieceVideo)> Video;
 
 private:
        friend struct overlap_video_test1;
+       friend struct check_reuse_old_data_test;
+
+       void video (std::shared_ptr<const ImageProxy> image, Frame frame, Eyes eyes, Part part);
 
+       std::weak_ptr<const Film> _film;
        std::shared_ptr<Content> _content;
+       std::shared_ptr<Decoder> _decoder;
        FrameRateChange _frc;
        bool _done = false;
+       boost::optional<dcpomatic::DCPTimePeriod> _ignore_video;
        std::map<AudioStreamPtr, dcpomatic::DCPTime> _stream_last_push_end;
 };