Use FileGroup in FFmpeg.

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

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 47b97baecc0816b96db472ea26864e355a4c5780..41051ee2edf3f9fcacc8d0e59e11d1ba8cd0a745 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -35,6 +35,13 @@
 #include <sys/sysctl.h>
 #include <mach-o/dyld.h>
 #endif
+#ifdef DCPOMATIC_POSIX
+#include <sys/types.h>
+#include <ifaddrs.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+#include "exceptions.h"
 
 using std::pair;
 using std::list;
@@ -44,6 +51,7 @@ using std::wstring;
 using std::make_pair;
 using boost::shared_ptr;
 
+/** @param s Number of seconds to sleep for */
 void
 dcpomatic_sleep (int s)
 {
@@ -114,6 +122,25 @@ cpu_info ()
        return info;
 }
 
+#ifdef DCPOMATIC_OSX
+/** @return Path of the Contents directory in the .app */
+boost::filesystem::path
+app_contents ()
+{
+       uint32_t size = 1024;
+       char buffer[size];
+       if (_NSGetExecutablePath (buffer, &size)) {
+               throw StringError ("_NSGetExecutablePath failed");
+       }
+       
+       boost::filesystem::path path (buffer);
+       path = boost::filesystem::canonical (path);
+       path = path.parent_path ();
+       path = path.parent_path ();
+       return path;
+}
+#endif
+
 void
 run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, shared_ptr<Log> log)
 {
@@ -189,15 +216,8 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
 #endif
 
 #ifdef DCPOMATIC_OSX
-       uint32_t size = 1024;
-       char buffer[size];
-       if (_NSGetExecutablePath (buffer, &size)) {
-               log->log ("_NSGetExecutablePath failed");
-               return;
-       }
-       
-       boost::filesystem::path path (buffer);
-       path.remove_filename ();
+       boost::filesystem::path path = app_contents();
+       path /= "MacOS";
        path /= "ffprobe";
        
        string ffprobe = path.string() + " \"" + content.string() + "\" 2> \"" + out.string() + "\"";
@@ -236,14 +256,13 @@ boost::filesystem::path
 openssl_path ()
 {
 #ifdef DCPOMATIC_WINDOWS
-
        wchar_t dir[512];
        GetModuleFileName (GetModuleHandle (0), dir, sizeof (dir));
        PathRemoveFileSpec (dir);
        
        boost::filesystem::path path = dir;
        path /= "openssl.exe";
-       return path
+       return path;
 #else  
        /* We assume that it's on the path for Linux and OS X */
        return "openssl";