Merge master.

[dcpomatic.git] / src / lib / cross.cc

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 9247baa97c2da963ba69d1b3bdeded56e0a780f7..0224e461d5fb8193fe82841ecdb34051711b2f6a 100644 (file)
--- 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,19 +190,19 @@ 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;
        }
 
        CloseHandle (child_stderr_write);
 
-       while (1) {
+       while (true) {
                char buffer[512];
                DWORD read;
                if (!ReadFile(child_stderr_read, buffer, sizeof(buffer), &read, 0) || read == 0) {
@@ -246,7 +247,7 @@ mount_info ()
                return m;
        }
        
-       while (1) {
+       while (true) {
                struct mntent* mnt = getmntent (f);
                if (!mnt) {
                        break;