Add set_font_file()

[libdcp.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index 20ea5ac571c991cc4a37f17bb1888e37423b3f0d..b66832654d02812da85ef9e04b908df11831395c 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -40,6 +40,7 @@
 
 #include "types.h"
 #include "data.h"
+#include "local_time.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/filesystem.hpp>
@@ -47,6 +48,8 @@
 #include <string>
 #include <stdint.h>
 
+#define LIBDCP_UNUSED(x) (void)(x)
+
 namespace xmlpp {
        class Element;
        class Node;
@@ -60,8 +63,7 @@ class OpenJPEGImage;
 
 extern std::string make_uuid ();
 extern std::string make_digest (boost::filesystem::path filename, boost::function<void (float)>);
-extern std::string content_kind_to_string (ContentKind kind);
-extern ContentKind content_kind_from_string (std::string kind);
+extern std::string make_digest (Data data);
 extern bool empty_or_white_space (std::string s);
 extern bool ids_equal (std::string a, std::string b);
 extern std::string remove_urn_uuid (std::string raw);
@@ -70,10 +72,15 @@ extern void init ();
 extern int base64_decode (std::string const & in, unsigned char* out, int out_length);
 extern boost::optional<boost::filesystem::path> relative_to_root (boost::filesystem::path root, boost::filesystem::path file);
 extern FILE * fopen_boost (boost::filesystem::path, std::string);
-extern std::string file_to_string (boost::filesystem::path, uintmax_t max_length = 65536);
+extern std::string file_to_string (boost::filesystem::path, uintmax_t max_length = 1048576);
 extern std::string private_key_fingerprint (std::string key);
 extern xmlpp::Node* find_child (xmlpp::Node const * node, std::string name);
 extern std::string openjpeg_version();
+extern std::string spaces (int n);
+extern void indent (xmlpp::Element* element, int initial);
+extern bool day_less_than_or_equal (LocalTime a, LocalTime b);
+extern bool day_greater_than_or_equal (LocalTime a, LocalTime b);
+extern std::string unique_string (std::list<std::string> existing, std::string base);
 
 }