X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=e383f9ff0a599e52e5ba6a97a4083f7cec773ea3;hb=4dbc6ef917aeceb906b1ef1caf6911033e7e2c54;hp=0b72ada9c52a55d7b822829dce94ceeac134f24c;hpb=c008066160d85b9ec9e5485375d7baaa5d27bda2;p=dcpomatic.git diff --git a/src/lib/content.h b/src/lib/content.h index 0b72ada9c..e383f9ff0 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -24,15 +24,14 @@ #ifndef DCPOMATIC_CONTENT_H #define DCPOMATIC_CONTENT_H -#include +#include "types.h" +#include "dcpomatic_time.h" +#include +#include #include #include #include #include -#include -#include -#include "types.h" -#include "dcpomatic_time.h" namespace cxml { class Node; @@ -110,7 +109,7 @@ public: bool paths_valid () const; /** @return MD5 digest of the content's file(s) */ - std::string digest () const { + boost::optional digest () const { boost::mutex::scoped_lock lm (_mutex); return _digest; } @@ -169,7 +168,7 @@ protected: std::vector _paths; private: - std::string _digest; + boost::optional _digest; DCPTime _position; DCPTime _trim_start; DCPTime _trim_end;