cpu_info ()
{
string info;
-
+
#ifdef DCPOMATIC_LINUX
/* This use of ifstream is ok; the filename can never
be non-Latin
if (sysctlbyname ("machdep.cpu.brand_string", buffer, &N, 0, 0) == 0) {
info = buffer;
}
-#endif
+#endif
#ifdef DCPOMATIC_WINDOWS
HKEY key;
}
info = string (value.begin(), value.end());
-
+
RegCloseKey (key);
-#endif
-
+#endif
+
return info;
}
if (_NSGetExecutablePath (buffer, &size)) {
throw StringError ("_NSGetExecutablePath failed");
}
-
+
boost::filesystem::path path (buffer);
path = boost::filesystem::canonical (path);
path = path.parent_path ();
return path.parent_path();
#endif
#ifdef DCPOMATIC_OSX
- return app_contents();
-#endif
+ return app_contents() / "Resources";
+#endif
}
void
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 ());
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 ());
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) {
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
{
#ifdef DCPOMATIC_WINDOWS
return _fseeki64 (stream, offset, whence);
-#else
+#else
return fseek (stream, offset, whence);
-#endif
+#endif
}
void
{
#ifdef DCPOMATIC_WINDOWS
SetThreadExecutionState (ES_SYSTEM_REQUIRED);
-#endif
+#endif
}
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
}