Detect CPU info on OS X.

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 2c66ab53a865725d63dbbd73d97e3ce1799ea19e..1f1be907f1bc850ccdb72ae4d552be3b7f596226 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -24,6 +24,12 @@
 #ifdef DVDOMATIC_WINDOWS
 #include "windows.h"
 #endif
+#ifdef DVDOMATIC_OSX
+#include <sys/sysctl.h>
+#endif
+
+using std::pair;
+using std::string;
 
 void
 dvdomatic_sleep (int s)
@@ -35,3 +41,40 @@ dvdomatic_sleep (int s)
        Sleep (s * 1000);
 #endif
 }
+
+/** @return A pair containing CPU model name and the number of processors */
+pair<string, int>
+cpu_info ()
+{
+       pair<string, int> info;
+       info.second = 0;
+       
+#ifdef DVDOMATIC_LINUX
+       ifstream f (N_("/proc/cpuinfo"));
+       while (f.good ()) {
+               string l;
+               getline (f, l);
+               if (boost::algorithm::starts_with (l, N_("model name"))) {
+                       string::size_type const c = l.find (':');
+                       if (c != string::npos) {
+                               info.first = l.substr (c + 2);
+                       }
+               } else if (boost::algorithm::starts_with (l, N_("processor"))) {
+                       ++info.second;
+               }
+       }
+#endif
+
+#ifdef DVDOMATIC_OSX
+       size_t N = sizeof (info.second);
+       sysctlbyname ("hw.ncpu", &info.second, &N, 0, 0);
+       char buffer[64];
+       N = sizeof (buffer);
+       if (sysctlbyname ("machdep.cpu.brand_string", buffer, &N, 0, 0) == 0) {
+               info.first = buffer;
+        }
+#endif         
+
+       return info;
+}
+

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 110660b16ea1783fec6b625d8a6748e793974e00..970bf3e9dc00b4b60486c330d6c077322614ea9a 100644 (file)
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -17,8 +17,11 @@
 
 */
 
+#include <string>
+
 #ifdef DVDOMATIC_WINDOWS
 #define WEXITSTATUS(w) (w)
 #endif
 
 void dvdomatic_sleep (int);
+extern std::pair<std::string, int> cpu_info ();

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 5573ee9d2867f87ae1d4b57703df7883be687147..8aedd76399899bef18b95523e2cf2ef0a577e4a6 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -52,6 +52,7 @@
 #include "audio_decoder.h"
 #include "sndfile_decoder.h"
 #include "analyse_audio_job.h"
+#include "cross.h"
 
 #include "i18n.h"
 

diff --git a/src/lib/util.cc b/src/lib/util.cc
index b8b60c6f645415652e66d883ff68722219a62bb5..4cf57368a7aea6718302c21441e719cdeeb7eb96 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -942,32 +942,6 @@ still_image_file (string f)
        return (ext == N_(".tif") || ext == N_(".tiff") || ext == N_(".jpg") || ext == N_(".jpeg") || ext == N_(".png") || ext == N_(".bmp"));
 }
 
-/** @return A pair containing CPU model name and the number of processors */
-pair<string, int>
-cpu_info ()
-{
-       pair<string, int> info;
-       info.second = 0;
-       
-#ifdef DVDOMATIC_POSIX
-       ifstream f (N_("/proc/cpuinfo"));
-       while (f.good ()) {
-               string l;
-               getline (f, l);
-               if (boost::algorithm::starts_with (l, N_("model name"))) {
-                       string::size_type const c = l.find (':');
-                       if (c != string::npos) {
-                               info.first = l.substr (c + 2);
-                       }
-               } else if (boost::algorithm::starts_with (l, N_("processor"))) {
-                       ++info.second;
-               }
-       }
-#endif 
-
-       return info;
-}
-
 string
 audio_channel_name (int c)
 {

diff --git a/src/lib/util.h b/src/lib/util.h
index 3e1d7f4b407d8326adf7869c0b0e15bd8785b269..0d745e50c5f3152c3984758c2260d0acf65a7fd1 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -299,7 +299,6 @@ private:
 
 extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second);
 extern bool still_image_file (std::string);
-extern std::pair<std::string, int> cpu_info ();
 
 class LocaleGuard
 {

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 71207c4ae771adcd5d71220cbe4782af1aec0c29..de94d0a2fdbaab0acc9c14e64696af169aeae701 100644 (file)
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -457,7 +457,7 @@ class App : public wxApp
                        return false;
                }
                
-#ifdef DVDOMATIC_POSIX         
+#ifdef DVDOMATIC_LINUX 
                unsetenv ("UBUNTU_MENUPROXY");
 #endif
 

diff --git a/src/tools/dvdomatic_batch.cc b/src/tools/dvdomatic_batch.cc
index 7a3d38d9c6d287b6f5106383c950a395ab6a3542..d9ddb9d468a2c79eb83634129cbf7a390afc0a70 100644 (file)
--- a/src/tools/dvdomatic_batch.cc
+++ b/src/tools/dvdomatic_batch.cc
@@ -197,7 +197,7 @@ class App : public wxApp
                        return false;
                }
                
-#ifdef DVDOMATIC_POSIX         
+#ifdef DVDOMATIC_LINUX         
                unsetenv ("UBUNTU_MENUPROXY");
 #endif         
 

diff --git a/wscript b/wscript
index beb0080d46ca83eaea7c41884ab2ab973661dd64..542c9b6409daf2bc2b6644e53a6200985def5a1d 100644 (file)
--- a/wscript
+++ b/wscript
@@ -55,6 +55,10 @@ def configure(conf):
     if conf.env.TARGET_LINUX:
         # libxml2 seems to be linked against this on Ubuntu but it doesn't mention it in its .pc file
         conf.env.append_value('LIB', 'lzma')
+        conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_LINUX')
+
+    if conf.env.TARGET_OSX:
+        conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_OSX')
 
     if conf.options.enable_debug:
         conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG'])