Merge.

[libdcp.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index 9ed674f7ae6754c31dc03334464e2bd30861fbdf..7056db6a372fe4def5fbe0cce8baa83b4a6a5e0a 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -17,12 +17,40 @@
 
 */
 
+/** @file  src/util.h
+ *  @brief Utility methods.
+ */
+
 #include <string>
-#include <sigc++/sigc++.h>
+#include <stdint.h>
+#include <boost/signals2.hpp>
+#include <openjpeg.h>
+#include "types.h"
 
 namespace libdcp {
+
+class ARGBFrame;       
        
+/** Create a UUID.
+ *  @return UUID.
+ */
 extern std::string make_uuid ();
-extern std::string make_digest (std::string, sigc::signal1<void, float> *);
+
+/** Create a digest for a file.
+ *  @param filename File name.
+ *  @param progress If non-0, a signal which will be emitted periodically to update
+ *  progress; the parameter will start at 0.5 and proceed to 1.
+ *  @return Digest.
+ */
+extern std::string make_digest (std::string filename, boost::signals2::signal<void (float)>* progress);
+
+extern std::string content_kind_to_string (ContentKind kind);
+extern ContentKind content_kind_from_string (std::string kind);
+extern bool starts_with (std::string big, std::string little);
+extern bool ends_with (std::string big, std::string little);
+extern bool empty_or_white_space (std::string s);
+
+extern opj_image_t* decompress_j2k (uint8_t* data, int64_t size, int reduce);
+extern boost::shared_ptr<ARGBFrame> xyz_to_rgb (opj_image_t* xyz_frame);
 
 }