X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpiece.h;h=56b16fb282f646b98403b9db74b70cbd12045a81;hb=ca3343840b28c258c91635cedc133ee064d9d03d;hp=7379a5c3f76091fb24cdb7a02e7145323b49ebfa;hpb=3b4794876db7b5351a09fa6366b87ae57af31463;p=dcpomatic.git

diff --git a/src/lib/piece.h b/src/lib/piece.h
index 7379a5c3f..56b16fb28 100644
--- a/src/lib/piece.h
+++ b/src/lib/piece.h
@@ -34,6 +34,7 @@
 class Content;
 class Decoder;
 class PlayerVideo;
+struct overlap_video_test1;
 
 
 class Piece
@@ -47,7 +48,7 @@ public:
 	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 content_time_to_dcp (dcpomatic::ContentTime t) const;
+	boost::optional<dcpomatic::DCPTime> content_time_to_dcp (std::shared_ptr<const Content> content, dcpomatic::ContentTime t) const;
 
 	void pass ();
 
@@ -55,7 +56,7 @@ public:
 	VideoFrameType video_frame_type () const;
 
 	FrameRateChange frame_rate_change () const {
-		return frc;
+		return _frc;
 	}
 
 	dcpomatic::DCPTime position () const;
@@ -65,18 +66,23 @@ public:
 
 	int resampled_audio_frame_rate (std::shared_ptr<const Film> film) const;
 	double audio_gain () const;
+	bool reference_dcp_audio () const;
 
 	std::shared_ptr<Decoder> decoder_for (std::shared_ptr<Content> content) const;
 
 	dcpomatic::DCPTime decoder_position () const;
+	bool has_text () const;
+	void seek (std::shared_ptr<const Film> film, dcpomatic::DCPTime time, bool accurate);
 
-	std::shared_ptr<Content> content;
 	std::shared_ptr<Decoder> decoder;
 	boost::optional<dcpomatic::DCPTimePeriod> ignore_video;
-	FrameRateChange frc;
 	bool done = false;
 
 private:
+	friend struct overlap_video_test1;
+
+	std::shared_ptr<Content> _content;
+	FrameRateChange _frc;
 	std::map<AudioStreamPtr, dcpomatic::DCPTime> _stream_last_push_end;
 };