Merge.

[libdcp.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index af6a08d671b789025055e83ddb6aab03cd1768d6..7056db6a372fe4def5fbe0cce8baa83b4a6a5e0a 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -23,7 +23,7 @@
 
 #include <string>
 #include <stdint.h>
-#include <sigc++/sigc++.h>
+#include <boost/signals2.hpp>
 #include <openjpeg.h>
 #include "types.h"
 
@@ -42,11 +42,13 @@ extern std::string make_uuid ();
  *  progress; the parameter will start at 0.5 and proceed to 1.
  *  @return Digest.
  */
-extern std::string make_digest (std::string filename, sigc::signal1<void, float>* progress);
+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);