From 370e815cdefee3e7b1794b28df585b2f86e8d391 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 6 Jun 2013 13:24:35 +0100 Subject: Basic about dialog containing supporters. --- src/tools/dvdomatic.cc | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) (limited to 'src/tools') diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 4c3a5260f..71207c4ae 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -26,7 +26,7 @@ #ifdef __WXOSX__ #include #endif -#include +#include #include #include #include "wx/film_viewer.h" @@ -38,6 +38,7 @@ #include "wx/new_film_dialog.h" #include "wx/properties_dialog.h" #include "wx/wx_ui_signaller.h" +#include "wx/about_dialog.h" #include "lib/film.h" #include "lib/format.h" #include "lib/config.h" @@ -45,7 +46,6 @@ #include "lib/util.h" #include "lib/scaler.h" #include "lib/exceptions.h" -#include "lib/version.h" #include "lib/ui_signaller.h" #include "lib/log.h" @@ -427,34 +427,9 @@ private: void help_about (wxCommandEvent &) { - wxAboutDialogInfo info; - info.SetName (_("DVD-o-matic")); - if (strcmp (dvdomatic_git_commit, "release") == 0) { - info.SetVersion (std_to_wx (String::compose ("version %1", dvdomatic_version))); - } else { - info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit))); - } - info.SetDescription (_("Free, open-source DCP generation from almost anything.")); - info.SetCopyright (_("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen")); - - wxArrayString authors; - authors.Add (wxT ("Carl Hetherington")); - authors.Add (wxT ("Terrence Meiczinger")); - authors.Add (wxT ("Paul Davis")); - authors.Add (wxT ("Ole Laursen")); - info.SetDevelopers (authors); - - wxArrayString translators; - translators.Add (wxT ("Olivier Perriere")); - translators.Add (wxT ("Lilian Lefranc")); - translators.Add (wxT ("Thierry Journet")); - translators.Add (wxT ("Massimiliano Broggi")); - translators.Add (wxT ("Manuel AC")); - translators.Add (wxT ("Adam Klotblixt")); - info.SetTranslators (translators); - - info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic")); - wxAboutBox (info); + AboutDialog* d = new AboutDialog (this); + d->ShowModal (); + d->Destroy (); } wxSizer* _top_sizer; -- cgit v1.2.3 From a991c734ebfedb5456cec827d5eaf2583fdbb9a1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Jun 2013 12:06:04 +0100 Subject: Detect CPU info on OS X. --- src/lib/cross.cc | 43 +++++++++++++++++++++++++++++++++++++++++++ src/lib/cross.h | 3 +++ src/lib/film.cc | 1 + src/lib/util.cc | 26 -------------------------- src/lib/util.h | 1 - src/tools/dvdomatic.cc | 2 +- src/tools/dvdomatic_batch.cc | 2 +- wscript | 4 ++++ 8 files changed, 53 insertions(+), 29 deletions(-) (limited to 'src/tools') diff --git a/src/lib/cross.cc b/src/lib/cross.cc index 2c66ab53a..1f1be907f 100644 --- 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 +#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 +cpu_info () +{ + pair 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 110660b16..970bf3e9d 100644 --- a/src/lib/cross.h +++ b/src/lib/cross.h @@ -17,8 +17,11 @@ */ +#include + #ifdef DVDOMATIC_WINDOWS #define WEXITSTATUS(w) (w) #endif void dvdomatic_sleep (int); +extern std::pair cpu_info (); diff --git a/src/lib/film.cc b/src/lib/film.cc index 5573ee9d2..8aedd7639 100644 --- 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 b8b60c6f6..4cf57368a 100644 --- 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 -cpu_info () -{ - pair 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 3e1d7f4b4..0d745e50c 100644 --- 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 cpu_info (); class LocaleGuard { diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 71207c4ae..de94d0a2f 100644 --- 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 7a3d38d9c..d9ddb9d46 100644 --- 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 beb0080d4..542c9b640 100644 --- 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']) -- cgit v1.2.3