X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=9365a6e2c3bb8bc0fa612efac67c2b645c44610a;hb=341f0a81591ab83b96069d6e6bb70cbf8e6cf878;hp=82f5a8089be69ff40bf753169213358d92dfc64b;hpb=cf8e0e9e26dbaefab768000ebc1655b34ad11105;p=dcpomatic.git diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h index 82f5a8089..9365a6e2c 100644 --- a/src/lib/dcp_content.h +++ b/src/lib/dcp_content.h @@ -52,7 +52,7 @@ public: DCPTime full_length () const; - void examine (boost::shared_ptr, bool calculate_digest); + void examine (boost::shared_ptr); std::string summary () const; std::string technical_summary () const; void as_xml (xmlpp::Node *) const; @@ -64,10 +64,7 @@ public: return _has_subtitles; } - boost::filesystem::path directory () const { - boost::mutex::scoped_lock lm (_mutex); - return _directory; - } + boost::filesystem::path directory () const; bool encrypted () const { boost::mutex::scoped_lock lm (_mutex); @@ -89,7 +86,6 @@ private: bool _has_subtitles; /** true if our DCP is encrypted */ bool _encrypted; - boost::filesystem::path _directory; boost::optional _kdm; /** true if _kdm successfully decrypts the first frame of our DCP */ bool _kdm_valid;