X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=b8bc1fc9e467680646f924c2ab3385d195911efb;hb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;hp=2e4abe64dc30f2f49a4aad27c9b444d290ac7cb4;hpb=e18ebfab7383efc601d3024687f9761419006184;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 2e4abe64d..b8bc1fc9e 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -45,6 +45,7 @@
 #include <magick/MagickCore.h>
 #include <magick/version.h>
 #include <libdcp/version.h>
+#include <libdcp/util.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -61,6 +62,7 @@ extern "C" {
 #include "sound_processor.h"
 #include "config.h"
 #include "ratio.h"
+#include "job.h"
 #ifdef DCPOMATIC_WINDOWS
 #include "stack.hpp"
 #endif
@@ -91,8 +93,8 @@ using boost::lexical_cast;
 using boost::optional;
 using libdcp::Size;
 
-boost::thread::id ui_thread;
-boost::filesystem::path backtrace_file;
+static boost::thread::id ui_thread;
+static boost::filesystem::path backtrace_file;
 
 /** Convert some number of seconds to a string representation
  *  in hours, minutes and seconds.
@@ -119,12 +121,6 @@ seconds_to_hms (int s)
 	return hms.str ();
 }
 
-string
-time_to_hms (Time t)
-{
-	return seconds_to_hms (t / TIME_HZ);
-}
-
 /** @param s Number of seconds.
  *  @return String containing an approximate description of s (e.g. "about 2 hours")
  */
@@ -207,15 +203,11 @@ void
 stacktrace (ostream& out, int levels)
 {
 	void *array[200];
-	size_t size;
-	char **strings;
-	size_t i;
-     
-	size = backtrace (array, 200);
-	strings = backtrace_symbols (array, size);
+	size_t size = backtrace (array, 200);
+	char** strings = backtrace_symbols (array, size);
      
 	if (strings) {
-		for (i = 0; i < size && (levels == 0 || i < size_t(levels)); i++) {
+		for (size_t i = 0; i < size && (levels == 0 || i < size_t(levels)); i++) {
 			out << N_("  ") << demangle (strings[i]) << "\n";
 		}
 		
@@ -417,6 +409,58 @@ md5_digest (boost::filesystem::path file)
 	return s.str ();
 }
 
+/** @param job Optional job for which to report progress */
+string
+md5_digest_directory (boost::filesystem::path directory, shared_ptr<Job> job)
+{
+	int const buffer_size = 64 * 1024;
+	char buffer[buffer_size];
+
+	MD5_CTX md5_context;
+	MD5_Init (&md5_context);
+
+	int files = 0;
+	if (job) {
+		for (boost::filesystem::directory_iterator i(directory); i != boost::filesystem::directory_iterator(); ++i) {
+			++files;
+		}
+	}
+
+	int j = 0;
+	for (boost::filesystem::directory_iterator i(directory); i != boost::filesystem::directory_iterator(); ++i) {
+		ifstream f (i->path().string().c_str(), std::ios::binary);
+		if (!f.good ()) {
+			throw OpenFileError (i->path().string());
+		}
+	
+		f.seekg (0, std::ios::end);
+		int bytes = f.tellg ();
+		f.seekg (0, std::ios::beg);
+
+		while (bytes > 0) {
+			int const t = min (bytes, buffer_size);
+			f.read (buffer, t);
+			MD5_Update (&md5_context, buffer, t);
+			bytes -= t;
+		}
+
+		if (job) {
+			job->set_progress (float (j) / files);
+			++j;
+		}
+	}
+
+	unsigned char digest[MD5_DIGEST_LENGTH];
+	MD5_Final (digest, &md5_context);
+
+	stringstream s;
+	for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) {
+		s << std::hex << std::setfill('0') << std::setw(2) << ((int) digest[i]);
+	}
+
+	return s.str ();
+}
+
 static bool
 about_equal (float a, float b)
 {
@@ -457,23 +501,6 @@ dcp_audio_frame_rate (int fs)
 	return 96000;
 }
 
-/** @param index Colour LUT index.
- *  @return Human-readable name.
- */
-string
-colour_lut_index_to_name (int index)
-{
-	switch (index) {
-	case 0:
-		return _("sRGB");
-	case 1:
-		return _("Rec 709");
-	}
-
-	assert (false);
-	return N_("");
-}
-
 Socket::Socket (int timeout)
 	: _deadline (_io_service)
 	, _socket (_io_service)
@@ -582,12 +609,6 @@ stride_round_up (int c, int const * stride, int t)
 	return a - (a % t);
 }
 
-int
-stride_lookup (int c, int const * stride)
-{
-	return stride[c];
-}
-
 /** Read a sequence of key / value pairs from a text stream;
  *  the keys are the first words on the line, and the values are
  *  the remainder of the line following the key.  Lines beginning
@@ -737,17 +758,17 @@ FrameRateConversion::FrameRateConversion (float source, int dcp)
 	change_speed = !about_equal (source * factor(), dcp);
 
 	if (!skip && !repeat && !change_speed) {
-		description = _("DCP and source have the same rate.\n");
+		description = _("Content and DCP have the same rate.\n");
 	} else {
 		if (skip) {
-			description = _("DCP will use every other frame of the source.\n");
+			description = _("DCP will use every other frame of the content.\n");
 		} else if (repeat) {
-			description = _("Each source frame will be doubled in the DCP.\n");
+			description = _("Each content frame will be doubled in the DCP.\n");
 		}
 
 		if (change_speed) {
 			float const pc = dcp * 100 / (source * factor());
-			description += String::compose (_("DCP will run at %1%% of the source speed.\n"), pc);
+			description += String::compose (_("DCP will run at %1%% of the content speed.\n"), pc);
 		}
 	}
 }
@@ -757,12 +778,12 @@ LocaleGuard::LocaleGuard ()
 {
 	char const * old = setlocale (LC_NUMERIC, 0);
 
-        if (old) {
-                _old = strdup (old);
-                if (strcmp (_old, "C")) {
-                        setlocale (LC_NUMERIC, "C");
-                }
-        }
+	if (old) {
+		_old = strdup (old);
+		if (strcmp (_old, "C")) {
+			setlocale (LC_NUMERIC, "C");
+		}
+	}
 }
 
 LocaleGuard::~LocaleGuard ()
@@ -770,3 +791,12 @@ LocaleGuard::~LocaleGuard ()
 	setlocale (LC_NUMERIC, _old);
 	free (_old);
 }
+
+bool
+valid_image_file (boost::filesystem::path f)
+{
+	string ext = f.extension().string();
+	transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
+	return (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" || ext == ".tga");
+}
+