X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=babc14a295c2d75cba261cf56c1dd2120ccdb03a;hb=444763dc3293f06bb4f956ebfa2991f94761103b;hp=5318d6a12aa837229d4e4ea6ff94ffe1a958fdb8;hpb=8a8c977c12fc65f1f50ea05099387e0fc8840e7d;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 5318d6a12..babc14a29 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -31,7 +31,10 @@ #include "change_signaller.h" #include "dcp_text_track.h" +#include "dcpomatic_time.h" #include "frame_rate_change.h" +#include "named_channel.h" +#include "resolution.h" #include "signaller.h" #include "transcode_job.h" #include "types.h" @@ -68,6 +71,7 @@ class Ratio; class Job; class Film; struct isdcf_name_test; +struct isdcf_name_with_atmos; struct recover_test_2d_encrypted; struct atmos_encrypted_passthrough_test; @@ -210,6 +214,8 @@ public: return _tolerant; } + bool last_written_by_earlier_than(int major, int minor, int micro) const; + /** Identifiers for the parts of our state; used for signalling changes. */ @@ -488,6 +494,7 @@ public: private: friend struct ::isdcf_name_test; + friend struct ::isdcf_name_with_atmos; friend struct ::recover_test_2d_encrypted; friend struct ::atmos_encrypted_passthrough_test; template friend class ChangeSignaller; @@ -516,6 +523,8 @@ private: */ boost::optional _directory; + boost::optional _last_written_by; + /** Name for DCP-o-matic */ std::string _name; /** True if a auto-generated ISDCF-compliant name should be used for our DCP */