summaryrefslogtreecommitdiff
path: root/src/lib/dcp_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-02-04 09:30:06 +0000
committerCarl Hetherington <cth@carlh.net>2015-02-04 09:30:06 +0000
commit079b097c0d227bc899fe7af19dd904813e09f635 (patch)
tree1c4958fec7339139d89cb3a2dbed60d29ec3026d /src/lib/dcp_content.h
parent0acdcc34f5d582474d586f75d5be627155ad9e08 (diff)
Don't store _directory in DCPContent, work it out from the paths instead.
Diffstat (limited to 'src/lib/dcp_content.h')
-rw-r--r--src/lib/dcp_content.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index aa53d76a9..9365a6e2c 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -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<dcp::EncryptedKDM> _kdm;
/** true if _kdm successfully decrypts the first frame of our DCP */
bool _kdm_valid;