fix prev. commit

[ardour.git] / gtk2_ardour / about.cc

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 1f79b47031060b6d31b72c4a990e02433b54999b..27df4b1b32a4e2e0ce64fcceb91db6b8412704ea 100644 (file)
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -27,11 +27,8 @@
 #include "pbd/file_utils.h"
 
 #include "ardour/revision.h"
-#include "ardour/version.h"
 #include "ardour/filesystem_paths.h"
 
-#include "version.h"
-
 #include "about.h"
 #include "configinfo.h"
 #include "rgb_macros.h"
@@ -49,6 +46,10 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+#ifndef CODENAME
+#define CODENAME ""
+#endif
+
 #ifdef WITH_PAYMENT_OPTIONS
 
 /* XPM */
@@ -130,12 +131,14 @@ static const char* authors[] = {
        N_("Sakari Bergen"),
        N_("Christian Borss"),
        N_("Chris Cannam"),
+       N_("Jeremy Carter"),
        N_("Jesse Chappell"),
        N_("Thomas Charbonnel"),
        N_("Sam Chessman"),
        N_("André Colomb"),
        N_("Paul Davis"),
        N_("Gerard van Dongen"),
+       N_("John Emmas"),
        N_("Colin Fletcher"),
        N_("Dave Flick"),
        N_("Hans Fugal"),
@@ -155,6 +158,7 @@ static const char* authors[] = {
        N_("Armand Klenk"),
        N_("Julien de Kozak"),
        N_("Matt Krai"),
+       N_("Georg Krause"),
        N_("Nick Lanham"),
        N_("Colin Law"),
        N_("Joshua Leach"),
@@ -162,6 +166,7 @@ static const char* authors[] = {
        N_("Nick Mainsbridge"),
        N_("Tim Mayberry"),
        N_("Doug Mclain"),
+       N_("Todd Naugle"),
        N_("Jack O'Quin"),
        N_("Nimal Ratnayake"),
        N_("David Robillard"),
@@ -178,6 +183,8 @@ static const char* authors[] = {
        N_("Mike Täht"),
        N_("Roy Vegard"),
        N_("Thorsten Wilms"),
+       N_("Damien Zammit"),
+       N_("Grygorii Zharun"),
        0
 };
 
@@ -581,15 +588,28 @@ About::About ()
                t += ' ';
        }
 
+#if defined __x86_64__ || defined _M_X64
+       const std::string cpu_arch = _("Intel 64 bit");
+#elif defined __i386__  || defined _M_IX86
+       const std::string cpu_arch = _("Intel 32 bit");
+#elif defined __ppc__ && defined  __LP64__
+       const std::string cpu_arch = _("PowerPC 64bit");
+#elif defined __ppc__
+       const std::string cpu_arch = _("PowerPC 32bit");
+#elif defined  __LP64__
+       const std::string cpu_arch = _("64bit");
+#else
+       const std::string cpu_arch = _("32bit"); // ARM, ALPHA,..
+#endif
        set_translator_credits (t);
-       set_copyright (_("Copyright (C) 1999-2013 Paul Davis\n"));
+       set_copyright (_("Copyright (C) 1999-2015 Paul Davis\n"));
        set_license (gpl);
        set_name (X_("Ardour"));
        set_website (X_("http://ardour.org/"));
        set_website_label (_("http://ardour.org/"));
-       set_version ((string_compose(_("%1\n(built from revision %2)"),
-                                    VERSIONSTRING,
-                                    revision)));
+       set_version ((string_compose(_("%1%2\n(built from revision %3)\n%4"),
+                                    VERSIONSTRING, CODENAME,
+                                    revision, cpu_arch)));
 
        Gtk::Button* config_button = manage (new Button (_("Config")));