Subtitle rearrangements.

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

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 9ca3fe2b09b250e54602dd96192e77d0cc3a8268..4e801f44cb4940fb1667ffd897b6de57ba93dc9f 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -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 */
@@ -140,7 +141,7 @@ 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);
@@ -252,7 +253,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
        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
@@ -352,3 +353,45 @@ Waker::~Waker ()
        IOPMAssertionRelease (_assertion_id);
 #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::path 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";
+       batch /= "Contents";
+       batch /= "MacOS";
+       batch /= "dcpomatic2_batch";
+#endif
+
+#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX)
+       pid_t pid = fork ();
+       if (pid == 0) {
+               std::cout << "start " << batch << " from " << dcpomatic << "\n";
+               int const r = system (batch.string().c_str());
+               exit (WEXITSTATUS (r));
+       }
+#endif
+
+#ifdef DCPOMATIC_WINDOWS
+       STARTUPINFO startup_info;
+       ZeroMemory (&startup_info, sizeof (startup_info));
+       startup_info.cb = sizeof (startup_info);
+
+       PROCESS_INFORMATION process_info;
+       ZeroMemory (&process_info, sizeof (process_info));
+
+       wchar_t cmd[512];
+       MultiByteToWideChar (CP_UTF8, 0, batch.string().c_str(), -1, cmd, sizeof(cmd));
+       CreateProcess (0, cmd, 0, 0, FALSE, 0, 0, 0, &startup_info, &process_info);
+#endif
+}