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 ++---------- src/wx/about_dialog.cc | 146 +++++++++++++++++++++++++++++++++++++++++++++++++ src/wx/about_dialog.h | 34 ++++++++++++ src/wx/wscript | 1 + 4 files changed, 186 insertions(+), 30 deletions(-) create mode 100644 src/wx/about_dialog.cc create mode 100644 src/wx/about_dialog.h (limited to 'src') 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; diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc new file mode 100644 index 000000000..49294b865 --- /dev/null +++ b/src/wx/about_dialog.cc @@ -0,0 +1,146 @@ +/* + Copyright (C) 2013 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include +#include "lib/version.h" +#include "lib/compose.hpp" +#include "about_dialog.h" +#include "wx_util.h" + +using std::vector; + +AboutDialog::AboutDialog (wxWindow* parent) + : wxDialog (parent, wxID_ANY, _("About DVD-o-matic")) +{ + wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); + + wxFont title_font (*wxNORMAL_FONT); + title_font.SetPointSize (title_font.GetPointSize() + 4); + title_font.SetWeight (wxFONTWEIGHT_BOLD); + + wxFont version_font (*wxNORMAL_FONT); + version_font.SetWeight (wxFONTWEIGHT_BOLD); + + wxStaticText* t = new wxStaticText (this, wxID_ANY, _("DVD-o-matic")); + t->SetFont (title_font); + sizer->Add (t, wxSizerFlags().Centre().Border()); + + wxString s; + if (strcmp (dvdomatic_git_commit, "release") == 0) { + t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1", dvdomatic_version))); + } else { + t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1 git %2", dvdomatic_version, dvdomatic_git_commit))); + } + t->SetFont (version_font); + sizer->Add (t, wxSizerFlags().Centre().Border()); + sizer->AddSpacer (12); + + t = new wxStaticText ( + this, wxID_ANY, + _("Free, open-source DCP generation from almost anything."), + wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER + ); + + sizer->Add (t, wxSizerFlags().Centre().Border()); + + t = new wxStaticText ( + this, wxID_ANY, + _("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"), + wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER + ); + + sizer->Add (t, wxSizerFlags().Centre().Border()); + + _notebook = new wxNotebook (this, wxID_ANY); + + wxArrayString written_by; + written_by.Add (wxT ("Carl Hetherington")); + written_by.Add (wxT ("Terrence Meiczinger")); + written_by.Add (wxT ("Paul Davis")); + written_by.Add (wxT ("Ole Laursen")); + add_section (_("Written by"), written_by); + + wxArrayString translated_by; + translated_by.Add (wxT ("Olivier Perriere")); + translated_by.Add (wxT ("Lilian Lefranc")); + translated_by.Add (wxT ("Thierry Journet")); + translated_by.Add (wxT ("Massimiliano Broggi")); + translated_by.Add (wxT ("Manuel AC")); + translated_by.Add (wxT ("Adam Klotblixt")); + add_section (_("Translated by"), translated_by); + + wxArrayString supported_by; + supported_by.Add (wxT ("Carsten Kurz")); + supported_by.Add (wxT ("Wolfgang Woehl")); + supported_by.Add (wxT ("Manual AC")); + supported_by.Add (wxT ("Theo Lipfert")); + supported_by.Add (wxT ("Olivier Lemaire")); + supported_by.Add (wxT ("Andrä Steiner")); + supported_by.Add (wxT ("Jonathan Jensen")); + supported_by.Add (wxT ("Kjarten Michaelsen")); + supported_by.Add (wxT ("Jussi Siponen")); + supported_by.Add (wxT ("Cinema Clarici")); + supported_by.Add (wxT ("Evan Freeze")); + supported_by.Add (wxT ("Flor Guillaume")); + supported_by.Add (wxT ("Adam Klotblixt ")); + supported_by.Add (wxT ("Lilian Lefranc")); + supported_by.Add (wxT ("Gavin Lewarne")); + supported_by.Add (wxT ("Lasse Salling")); + supported_by.Add (wxT ("Andres Fink")); + supported_by.Add (wxT ("Kieran Carroll")); + add_section (_("Supported by"), supported_by); + + sizer->Add (_notebook, wxSizerFlags().Centre().Border().Expand()); + +#if 0 + info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic")); +#endif + + SetSizerAndFit (sizer); +} + +void +AboutDialog::add_section (wxString name, wxArrayString credits) +{ + static bool first = true; + int const N = 3; + + wxPanel* panel = new wxPanel (_notebook, wxID_ANY); + wxSizer* overall_sizer = new wxBoxSizer (wxHORIZONTAL); + + vector sizers; + + for (int i = 0; i < N; ++i) { + sizers.push_back (new wxBoxSizer (wxVERTICAL)); + overall_sizer->Add (sizers.back (), 1, wxEXPAND); + } + + int c = 0; + for (size_t i = 0; i < credits.Count(); ++i) { + add_label_to_sizer (sizers[c], panel, credits[i]); + ++c; + if (c == N) { + c = 0; + } + } + + panel->SetSizerAndFit (overall_sizer); + _notebook->AddPage (panel, name, first); + first = false; +} diff --git a/src/wx/about_dialog.h b/src/wx/about_dialog.h new file mode 100644 index 000000000..a78abb93e --- /dev/null +++ b/src/wx/about_dialog.h @@ -0,0 +1,34 @@ +/* + Copyright (C) 2013 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include + +class wxNotebook; + +class AboutDialog : public wxDialog +{ +public: + AboutDialog (wxWindow *); + +private: + void add_section (wxString, wxArrayString); + + wxNotebook* _notebook; +}; + diff --git a/src/wx/wscript b/src/wx/wscript index 42bb8ca88..1c5e3b8cc 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -4,6 +4,7 @@ from waflib import Logs import i18n sources = """ + about_dialog.cc audio_dialog.cc audio_plot.cc config_dialog.cc -- cgit v1.2.3 From 146a3fa78e8ed6f9ec8c44e659661f424c529b12 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 6 Jun 2013 14:15:28 +0100 Subject: Tweak about box spacing. --- src/wx/about_dialog.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 49294b865..84cfbce08 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -128,7 +128,7 @@ AboutDialog::add_section (wxString name, wxArrayString credits) for (int i = 0; i < N; ++i) { sizers.push_back (new wxBoxSizer (wxVERTICAL)); - overall_sizer->Add (sizers.back (), 1, wxEXPAND); + overall_sizer->Add (sizers.back (), 1, wxEXPAND | wxALL, 6); } int c = 0; -- 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') 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 From 43b4e55710271c797b5d251c891047ed4da20e10 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 13 Jun 2013 21:24:56 +0100 Subject: Add somewhat empirical support for YUVJ42{0,2,4}P pixels. --- src/lib/image.cc | 14 +++++++++++--- test/make_black_test.cc | 6 ++++++ test/test.cc | 3 +++ 3 files changed, 20 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lib/image.cc b/src/lib/image.cc index bd527e91e..f28652d4e 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -273,11 +273,11 @@ void Image::make_black () { /* U/V black value for 8-bit colour */ - static uint8_t const eight_bit_uv = (1 << 7) - 1; + static uint8_t const eight_bit_uv = (1 << 7) - 1; /* U/V black value for 9-bit colour */ - static uint16_t const nine_bit_uv = (1 << 8) - 1; + static uint16_t const nine_bit_uv = (1 << 8) - 1; /* U/V black value for 10-bit colour */ - static uint16_t const ten_bit_uv = (1 << 9) - 1; + static uint16_t const ten_bit_uv = (1 << 9) - 1; /* U/V black value for 16-bit colour */ static uint16_t const sixteen_bit_uv = (1 << 15) - 1; @@ -290,6 +290,14 @@ Image::make_black () memset (data()[2], eight_bit_uv, lines(2) * stride()[2]); break; + case PIX_FMT_YUVJ420P: + case PIX_FMT_YUVJ422P: + case PIX_FMT_YUVJ444P: + memset (data()[0], 0, lines(0) * stride()[0]); + memset (data()[1], eight_bit_uv + 1, lines(1) * stride()[1]); + memset (data()[2], eight_bit_uv + 1, lines(2) * stride()[2]); + break; + case PIX_FMT_YUV422P9LE: case PIX_FMT_YUV444P9LE: yuv_16_black (nine_bit_uv); diff --git a/test/make_black_test.cc b/test/make_black_test.cc index 3c0b979ff..714621762 100644 --- a/test/make_black_test.cc +++ b/test/make_black_test.cc @@ -35,6 +35,9 @@ BOOST_AUTO_TEST_CASE (make_black_test) pix_fmts.push_back (AV_PIX_FMT_YUV444P10LE); pix_fmts.push_back (AV_PIX_FMT_YUV444P10BE); pix_fmts.push_back (AV_PIX_FMT_UYVY422); + pix_fmts.push_back (AV_PIX_FMT_YUVJ420P); + pix_fmts.push_back (AV_PIX_FMT_YUVJ422P); + pix_fmts.push_back (AV_PIX_FMT_YUVJ444P); int N = 0; for (list::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) { @@ -46,6 +49,9 @@ BOOST_AUTO_TEST_CASE (make_black_test) for (int y = 0; y < bar->size().height; ++y) { uint8_t* q = p; for (int x = 0; x < bar->line_size()[0]; ++x) { + if (*q != 0) { + std::cerr << "x=" << x << ", (x%3)=" << (x%3) << "\n"; + } BOOST_CHECK_EQUAL (*q++, 0); } p += bar->stride()[0]; diff --git a/test/test.cc b/test/test.cc index 91c876412..65b1f9056 100644 --- a/test/test.cc +++ b/test/test.cc @@ -62,6 +62,8 @@ struct TestConfig Config::instance()->set_servers (vector ()); Config::instance()->set_server_port (61920); Config::instance()->set_default_dci_metadata (DCIMetadata ()); + Config::instance()->set_default_format (static_cast (0)); + Config::instance()->set_default_dcp_content_type (static_cast (0)); } }; @@ -101,3 +103,4 @@ new_test_film (string name) #include "job_test.cc" #include "client_server_test.cc" #include "image_test.cc" + -- cgit v1.2.3 From 4e20374d794c790c9633141849882da1458307cf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 13 Jun 2013 21:55:28 +0100 Subject: Add URL to about box. --- src/wx/about_dialog.cc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src') diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 84cfbce08..27644a00f 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -18,6 +18,7 @@ */ #include +#include #include "lib/version.h" #include "lib/compose.hpp" #include "about_dialog.h" @@ -59,6 +60,14 @@ AboutDialog::AboutDialog (wxWindow* parent) sizer->Add (t, wxSizerFlags().Centre().Border()); + wxHyperlinkCtrl* h = new wxHyperlinkCtrl ( + this, wxID_ANY, + wxT ("www.carlh.net/software/dvdomatic"), + wxT ("http://www.carlh.net/software/dvdomatic") + ); + + sizer->Add (h, wxSizerFlags().Centre().Border()); + t = new wxStaticText ( this, wxID_ANY, _("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"), -- cgit v1.2.3 From 8af74cd10c9568513aec0326231f5228b4782adf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 13 Jun 2013 23:23:36 +0100 Subject: Try to fix build. --- src/lib/cross.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lib/cross.cc b/src/lib/cross.cc index 1f1be907f..b654be6df 100644 --- a/src/lib/cross.cc +++ b/src/lib/cross.cc @@ -17,6 +17,8 @@ */ +#include +#include #include "cross.h" #ifdef DVDOMATIC_POSIX #include @@ -50,16 +52,16 @@ cpu_info () info.second = 0; #ifdef DVDOMATIC_LINUX - ifstream f (N_("/proc/cpuinfo")); + ifstream f ("/proc/cpuinfo"); while (f.good ()) { string l; getline (f, l); - if (boost::algorithm::starts_with (l, N_("model name"))) { + if (boost::algorithm::starts_with (l, "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"))) { + } else if (boost::algorithm::starts_with (l, "processor")) { ++info.second; } } -- cgit v1.2.3 From 4fe7c89e54205c56f0fba2da24db66734ce23674 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 13 Jun 2013 23:40:41 +0100 Subject: Fix build again. --- src/lib/cross.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/lib/cross.cc b/src/lib/cross.cc index b654be6df..7fbba86f9 100644 --- a/src/lib/cross.cc +++ b/src/lib/cross.cc @@ -31,6 +31,7 @@ #endif using std::pair; +using std::ifstream; using std::string; void -- cgit v1.2.3