Basics of send-to-batch-converter; not tested on Windows nor OS X.

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

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 9894d885f1cea6e0c7a3a7e8f7d9d02a66d8b735..6398e36764be282f60b355fa06613f79c810f7bc 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -46,9 +46,9 @@
 
 #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;
@@ -56,6 +56,7 @@ using std::ifstream;
 using std::string;
 using std::wstring;
 using std::make_pair;
+using std::runtime_error;
 using boost::shared_ptr;
 
 /** @param s Number of seconds to sleep for */
@@ -75,7 +76,7 @@ string
 cpu_info ()
 {
        string info;
-       
+
 #ifdef DCPOMATIC_LINUX
        /* This use of ifstream is ok; the filename can never
           be non-Latin
@@ -99,7 +100,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 +125,11 @@ cpu_info ()
        }
 
        info = string (value.begin(), value.end());
-       
+
        RegCloseKey (key);
 
-#endif 
-       
+#endif
+
        return info;
 }
 
@@ -140,9 +141,9 @@ app_contents ()
        uint32_t size = 1024;
        char buffer[size];
        if (_NSGetExecutablePath (buffer, &size)) {
-               throw StringError ("_NSGetExecutablePath failed");
+               throw runtime_error ("_NSGetExecutablePath failed");
        }
-       
+
        boost::filesystem::path path (buffer);
        path = boost::filesystem::canonical (path);
        path = path.parent_path ();
@@ -155,6 +156,10 @@ 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
@@ -165,8 +170,8 @@ shared_path ()
        return path.parent_path();
 #endif
 #ifdef DCPOMATIC_OSX
-       return app_contents();
-#endif 
+       return app_contents() / "Resources";
+#endif
 }
 
 void
@@ -237,7 +242,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 ());
@@ -247,8 +252,8 @@ 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() + "\"";
+
+       string ffprobe = "\"" + path.string() + "\" \"" + content.string() + "\" 2> \"" + out.string() + "\"";
        LOG_GENERAL (N_("Probing with %1"), ffprobe);
        system (ffprobe.c_str ());
 #endif
@@ -258,13 +263,13 @@ 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 (true) {
                struct mntent* mnt = getmntent (f);
                if (!mnt) {
@@ -287,11 +292,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
@@ -319,9 +324,9 @@ 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
@@ -329,7 +334,7 @@ Waker::nudge ()
 {
 #ifdef DCPOMATIC_WINDOWS
        SetThreadExecutionState (ES_SYSTEM_REQUIRED);
-#endif 
+#endif
 }
 
 Waker::Waker ()
@@ -339,12 +344,38 @@ 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
+}
+
+void
+start_batch_converter (boost::filesystem::path dcpomatic)
+{
+#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_WINDOWS)
+       boost::filesystem::path batch = dcpomatic.parent_path() / "dcpomatic2_batch";
+#endif
+
+#ifdef DCPOMATIC_OSX
+       boost::filesystem::patch batch = dcpomatic.parent_path ();
+       batch = batch.parent_path (); // MacOS
+       batch = batch.parent_path (); // Contents
+       batch = batch.parent_path (); // DCP-o-matic.app
+       batch = batch.parent_path (); // Applications
+       batch /= "DCP-o-matic 2 Batch Converter.app" / "Contents" / "MacOS" / "dcpomatic2_batch";
+#endif
+
+#ifdef DCPOMATIC_LINUX
+       pid_t pid = fork ();
+       if (pid == 0) {
+               int const r = system (batch.string().c_str ());
+               exit (WEXITSTATUS (r));
+       }
+#endif
+
 }