X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross.cc;h=53ef5723ac50232d5e05fb8664a7b8dc3eba766d;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hp=9247baa97c2da963ba69d1b3bdeded56e0a780f7;hpb=71d8cf20889a3c419c9a3e485f461236e5317423;p=dcpomatic.git

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 9247baa97..53ef5723a 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -46,8 +46,9 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) log->log (String::compose (__VA_ARGS__), Log::GENERAL);
-#define LOG_ERROR(...) log->log (String::compose (__VA_ARGS__), Log::ERROR);
+#define LOG_GENERAL(...) log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_ERROR(...) log->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR);
+#define LOG_ERROR_NC(...) log->log (__VA_ARGS__, Log::TYPE_ERROR);
 
 using std::pair;
 using std::list;
@@ -162,7 +163,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
 	HANDLE child_stderr_read;
 	HANDLE child_stderr_write;
 	if (!CreatePipe (&child_stderr_read, &child_stderr_write, &security, 0)) {
-		log->log ("ffprobe call failed (could not CreatePipe)");
+		LOG_ERROR_NC ("ffprobe call failed (could not CreatePipe)");
 		return;
 	}
 
@@ -189,13 +190,13 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
 	PROCESS_INFORMATION process_info;
 	ZeroMemory (&process_info, sizeof (process_info));
 	if (!CreateProcess (0, command, 0, 0, TRUE, CREATE_NO_WINDOW, 0, 0, &startup_info, &process_info)) {
-		LOG_ERROR (N_("ffprobe call failed (could not CreateProcess)"));
+		LOG_ERROR_NC (N_("ffprobe call failed (could not CreateProcess)"));
 		return;
 	}
 
 	FILE* o = fopen_boost (out, "w");
 	if (!o) {
-		LOG_ERROR (N_("ffprobe call failed (could not create output file)"));
+		LOG_ERROR_NC (N_("ffprobe call failed (could not create output file)"));
 		return;
 	}