Make player more tolerant of some DCP errors.

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

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 898b84e5d570de2c79ea0bf6bc4813f5eb699dd1..2e63b24a296ca488079150378a8942982cada924 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -40,7 +40,13 @@ struct dcp_subtitle_within_dcp_test;
 class DCPDecoder : public DCP, public Decoder
 {
 public:
-       DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log, bool fast);
+       DCPDecoder (
+               boost::shared_ptr<const Film> film,
+               boost::shared_ptr<const DCPContent>,
+               bool fast,
+               bool tolerant,
+               boost::shared_ptr<DCPDecoder> old
+               );
 
        std::list<boost::shared_ptr<dcp::Reel> > reels () const {
                return _reels;
@@ -50,18 +56,25 @@ public:
        void set_forced_reduction (boost::optional<int> reduction);
 
        bool pass ();
-       void seek (ContentTime t, bool accurate);
+       void seek (dcpomatic::ContentTime t, bool accurate);
 
 private:
        friend struct dcp_subtitle_within_dcp_test;
 
        void next_reel ();
        void get_readers ();
-       void pass_captions (ContentTime next);
-       void pass_captions (ContentTime next, boost::shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, boost::shared_ptr<CaptionDecoder> decoder);
+       void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
+       void pass_texts (
+               dcpomatic::ContentTime next,
+               boost::shared_ptr<dcp::SubtitleAsset> asset,
+               bool reference,
+               int64_t entry_point,
+               boost::shared_ptr<TextDecoder> decoder,
+               dcp::Size size
+               );
 
        /** Time of next thing to return from pass relative to the start of _reel */
-       ContentTime _next;
+       dcpomatic::ContentTime _next;
        std::list<boost::shared_ptr<dcp::Reel> > _reels;
 
        std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;