diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-03 10:37:15 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-03 10:37:15 +0000 |
| commit | 51cc8f575b55f2a21d8503965b628c0f59f1ed33 (patch) | |
| tree | 7931d7c75bdf97d566056610cecffaf24b2c9bf4 /src/lib/content.h | |
| parent | c008066160d85b9ec9e5485375d7baaa5d27bda2 (diff) | |
Hand-apply d3bc61f0af33fedf02ac1a28cf91989ee9cd2fb6 from master;
make digest optional.
Diffstat (limited to 'src/lib/content.h')
| -rw-r--r-- | src/lib/content.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/content.h b/src/lib/content.h index 0b72ada9c..c2841b64e 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -110,7 +110,7 @@ public: bool paths_valid () const; /** @return MD5 digest of the content's file(s) */ - std::string digest () const { + boost::optional<std::string> digest () const { boost::mutex::scoped_lock lm (_mutex); return _digest; } @@ -169,7 +169,7 @@ protected: std::vector<boost::filesystem::path> _paths; private: - std::string _digest; + boost::optional<std::string> _digest; DCPTime _position; DCPTime _trim_start; DCPTime _trim_end; |