X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross.cc;h=ee0ef89b2ea0c9394b53124b700605d5c703a3af;hp=86b6574322076d0ad530a79291fdf215e5221841;hb=89115db77729a2c99f1a09ff6a461720e16f889e;hpb=9d0306c425800a7ccd1450f2fe984e2ea61b4499

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 86b657432..ee0ef89b2 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -22,16 +22,16 @@
 #include "cross.h"
 #include "compose.hpp"
 #include "log.h"
-#ifdef DVDOMATIC_LINUX
+#ifdef DCPOMATIC_LINUX
 #include <unistd.h>
 #include <mntent.h>
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 #include <windows.h>
 #undef DATADIR
 #include <shlwapi.h>
 #endif
-#ifdef DVDOMATIC_OSX
+#ifdef DCPOMATIC_OSX
 #include <sys/sysctl.h>
 #endif
 
@@ -43,12 +43,12 @@ using std::make_pair;
 using boost::shared_ptr;
 
 void
-dvdomatic_sleep (int s)
+dcpomatic_sleep (int s)
 {
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 	sleep (s);
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 	Sleep (s * 1000);
 #endif
 }
@@ -60,7 +60,7 @@ cpu_info ()
 	pair<string, int> info;
 	info.second = 0;
 	
-#ifdef DVDOMATIC_LINUX
+#ifdef DCPOMATIC_LINUX
 	ifstream f ("/proc/cpuinfo");
 	while (f.good ()) {
 		string l;
@@ -76,7 +76,7 @@ cpu_info ()
 	}
 #endif
 
-#ifdef DVDOMATIC_OSX
+#ifdef DCPOMATIC_OSX
 	size_t N = sizeof (info.second);
 	sysctlbyname ("hw.ncpu", &info.second, &N, 0, 0);
 	char buffer[64];
@@ -92,7 +92,7 @@ cpu_info ()
 void
 run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, shared_ptr<Log> log)
 {
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 	SECURITY_ATTRIBUTES security;
 	security.nLength = sizeof (security);
 	security.bInheritHandle = TRUE;
@@ -117,12 +117,14 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
 	startup_info.dwFlags |= STARTF_USESTDHANDLES;
 
 	wchar_t command[512];
-	wcscpy (command, L"ffprobe.exe ");
+	wcscpy (command, L"ffprobe.exe \"");
 
 	wchar_t file[512];
 	MultiByteToWideChar (CP_UTF8, 0, content.string().c_str(), -1, file, sizeof(file));
 	wcscat (command, file);
 
+	wcscat (command, L"\"");
+
 	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)) {
@@ -165,7 +167,7 @@ mount_info ()
 {
 	list<pair<string, string> > m;
 	
-#ifdef DVDOMATIC_LINUX
+#ifdef DCPOMATIC_LINUX
 	FILE* f = setmntent ("/etc/mtab", "r");
 	if (!f) {
 		return m;