Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 53ef5723ac50232d5e05fb8664a7b8dc3eba766d..9ca3fe2b09b250e54602dd96192e77d0cc3a8268 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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
@@ -17,11 +17,11 @@
 
 */
 
-#include <fstream>
-#include <boost/algorithm/string.hpp>
 #include "cross.h"
 #include "compose.hpp"
 #include "log.h"
+#include "exceptions.h"
+#include <boost/algorithm/string.hpp>
 #ifdef DCPOMATIC_LINUX
 #include <unistd.h>
 #include <mntent.h>
@@ -42,13 +42,13 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
-#include "exceptions.h"
+#include <fstream>
 
 #include "i18n.h"
 
-#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);
+#define LOG_GENERAL(...) log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+#define LOG_ERROR(...) log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR);
+#define LOG_ERROR_NC(...) log->log (__VA_ARGS__, LogEntry::TYPE_ERROR);
 
 using std::pair;
 using std::list;
@@ -75,7 +75,7 @@ string
 cpu_info ()
 {
        string info;
-       
+
 #ifdef DCPOMATIC_LINUX
        /* This use of ifstream is ok; the filename can never
           be non-Latin
@@ -99,7 +99,7 @@ cpu_info ()
        if (sysctlbyname ("machdep.cpu.brand_string", buffer, &N, 0, 0) == 0) {
                info = buffer;
        }
-#endif         
+#endif
 
 #ifdef DCPOMATIC_WINDOWS
        HKEY key;
@@ -124,11 +124,11 @@ cpu_info ()
        }
 
        info = string (value.begin(), value.end());
-       
+
        RegCloseKey (key);
 
-#endif 
-       
+#endif
+
        return info;
 }
 
@@ -142,7 +142,7 @@ app_contents ()
        if (_NSGetExecutablePath (buffer, &size)) {
                throw StringError ("_NSGetExecutablePath failed");
        }
-       
+
        boost::filesystem::path path (buffer);
        path = boost::filesystem::canonical (path);
        path = path.parent_path ();
@@ -151,6 +151,28 @@ app_contents ()
 }
 #endif
 
+boost::filesystem::path
+shared_path ()
+{
+#ifdef DCPOMATIC_LINUX
+       char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX");
+       if (p) {
+               return p;
+       }
+       return boost::filesystem::canonical (LINUX_SHARE_PREFIX);
+#endif
+#ifdef DCPOMATIC_WINDOWS
+       wchar_t dir[512];
+       GetModuleFileName (GetModuleHandle (0), dir, sizeof (dir));
+       PathRemoveFileSpec (dir);
+       boost::filesystem::path path = dir;
+       return path.parent_path();
+#endif
+#ifdef DCPOMATIC_OSX
+       return app_contents() / "Resources";
+#endif
+}
+
 void
 run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, shared_ptr<Log> log)
 {
@@ -202,7 +224,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
 
        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) {
@@ -219,7 +241,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
        CloseHandle (child_stderr_read);
 #endif
 
-#ifdef DCPOMATIC_LINUX 
+#ifdef DCPOMATIC_LINUX
        string ffprobe = "ffprobe \"" + content.string() + "\" 2> \"" + out.string() + "\"";
        LOG_GENERAL (N_("Probing with %1"), ffprobe);
         system (ffprobe.c_str ());
@@ -229,7 +251,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
        boost::filesystem::path path = app_contents();
        path /= "MacOS";
        path /= "ffprobe";
-       
+
        string ffprobe = path.string() + " \"" + content.string() + "\" 2> \"" + out.string() + "\"";
        LOG_GENERAL (N_("Probing with %1"), ffprobe);
        system (ffprobe.c_str ());
@@ -240,14 +262,14 @@ list<pair<string, string> >
 mount_info ()
 {
        list<pair<string, string> > m;
-       
+
 #ifdef DCPOMATIC_LINUX
        FILE* f = setmntent ("/etc/mtab", "r");
        if (!f) {
                return m;
        }
-       
-       while (1) {
+
+       while (true) {
                struct mntent* mnt = getmntent (f);
                if (!mnt) {
                        break;
@@ -269,11 +291,11 @@ openssl_path ()
        wchar_t dir[512];
        GetModuleFileName (GetModuleHandle (0), dir, sizeof (dir));
        PathRemoveFileSpec (dir);
-       
+
        boost::filesystem::path path = dir;
        path /= "openssl.exe";
        return path;
-#else  
+#else
        /* We assume that it's on the path for Linux and OS X */
        return "openssl";
 #endif
@@ -301,17 +323,17 @@ dcpomatic_fseek (FILE* stream, int64_t offset, int whence)
 {
 #ifdef DCPOMATIC_WINDOWS
        return _fseeki64 (stream, offset, whence);
-#else  
+#else
        return fseek (stream, offset, whence);
-#endif 
+#endif
 }
 
 void
 Waker::nudge ()
 {
 #ifdef DCPOMATIC_WINDOWS
-       SetThreadExecutionState (ES_CONTINUOUS);
-#endif 
+       SetThreadExecutionState (ES_SYSTEM_REQUIRED);
+#endif
 }
 
 Waker::Waker ()
@@ -321,12 +343,12 @@ Waker::Waker ()
         // IOPMAssertionCreateWithName (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, CFSTR ("Encoding DCP"), &_assertion_id);
        /* but it's not available on 10.5, so we use this */
         IOPMAssertionCreate (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, &_assertion_id);
-#endif 
+#endif
 }
 
 Waker::~Waker ()
 {
-#ifdef DCPOMATIC_OSX   
+#ifdef DCPOMATIC_OSX
        IOPMAssertionRelease (_assertion_id);
-#endif 
+#endif
 }