Use FileGroup in FFmpeg.

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

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 5ecbedf6eaaf49bcb505a5139236a7e5e41954d9..41051ee2edf3f9fcacc8d0e59e11d1ba8cd0a745 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -33,7 +33,15 @@
 #endif
 #ifdef DCPOMATIC_OSX
 #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;
@@ -43,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)
 {
@@ -113,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)
 {
@@ -179,11 +207,23 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
        CloseHandle (process_info.hProcess);
        CloseHandle (process_info.hThread);
        CloseHandle (child_stderr_read);
-#else
+#endif
+
+#ifdef DCPOMATIC_LINUX 
        string ffprobe = "ffprobe \"" + content.string() + "\" 2> \"" + out.string() + "\"";
        log->log (String::compose ("Probing with %1", ffprobe));
+        system (ffprobe.c_str ());
+#endif
+
+#ifdef DCPOMATIC_OSX
+       boost::filesystem::path path = app_contents();
+       path /= "MacOS";
+       path /= "ffprobe";
+       
+       string ffprobe = path.string() + " \"" + content.string() + "\" 2> \"" + out.string() + "\"";
+       log->log (String::compose ("Probing with %1", ffprobe));
        system (ffprobe.c_str ());
-#endif 
+#endif
 }
 
 list<pair<string, string> >
@@ -211,3 +251,21 @@ mount_info ()
 
        return m;
 }
+
+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;
+#else  
+       /* We assume that it's on the path for Linux and OS X */
+       return "openssl";
+#endif
+
+}