Fix tm_to_string to use local timezone on all platforms. Some comments.

[libdcp.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index 9153dbdaafcbd4689f494b802fc15249123bb089..94ee136a2aac206b3700c36944d39d6fb65cf872 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -27,6 +27,9 @@
 #include <string>
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/filesystem.hpp>
 #include <openjpeg.h>
 #include "types.h"
 
@@ -51,6 +54,10 @@ struct Size {
                : width (w)
                , height (h)
        {}
+
+       float ratio () const {
+               return float (width) / height;
+       }
        
        int width;
        int height;
@@ -60,7 +67,7 @@ extern bool operator== (Size const & a, Size const & b);
 extern bool operator!= (Size const & a, Size const & b);
 
 extern std::string make_uuid ();
-extern std::string make_digest (std::string filename);
+extern std::string make_digest (std::string filename, boost::function<void (float)> *);
 extern std::string content_kind_to_string (ContentKind kind);
 extern ContentKind content_kind_from_string (std::string kind);
 extern bool empty_or_white_space (std::string s);
@@ -68,12 +75,17 @@ extern boost::shared_ptr<XYZFrame> decompress_j2k (uint8_t* data, int64_t size,
 
 extern void init ();
 
-extern void sign (xmlpp::Element* parent, CertificateChain const & certificates, std::string const & signer_key, bool interop);
-extern void add_signature_value (xmlpp::Element* parent, CertificateChain const & certificates, std::string const & signer_key, std::string const & ns);
+extern void sign (xmlpp::Element* parent, CertificateChain const & certificates, boost::filesystem::path signer_key, bool interop);
+extern void add_signature_value (xmlpp::Element* parent, CertificateChain const & certificates, boost::filesystem::path signer_key, std::string const & ns);
 extern void add_signer (xmlpp::Element* parent, CertificateChain const & certificates, std::string const & ns);
 
 extern int base64_decode (std::string const & in, unsigned char* out, int out_length);
 
+extern std::string tm_to_string (struct tm *);
+extern std::string utc_offset_to_string (boost::posix_time::time_duration);
+extern std::string ptime_to_string (boost::posix_time::ptime);
+extern FILE * fopen_boost (boost::filesystem::path, std::string);
+       
 }
 
 #endif