X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fenvironment_info.cc;h=6fb75a0371e1cfebe57be9480ae6e3e7a681427a;hb=ab1c8a67afba072b1c29f0c3c34aa9779643e66a;hp=da34d5a9aff3486dc190966d46c1753a2ed9c9ce;hpb=81f361a0da4eef3ce83d003204042104d5555d39;p=dcpomatic.git

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index da34d5a9a..6fb75a037 100644
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,17 +25,25 @@
 #include <dcp/version.h>
 #include <libssh/libssh.h>
 #ifdef DCPOMATIC_IMAGE_MAGICK
+/* ImageMagick */
+#ifdef DCPOMATIC_MAGICKCORE_MAGICK
 #include <magick/MagickCore.h>
+#include <magick/version.h>
+#else
+#include <MagickCore/MagickCore.h>
+#include <MagickCore/version.h>
+#endif
 #else
+/* GraphicsMagick */
 #include <magick/common.h>
 #include <magick/magick_config.h>
-#endif
 #include <magick/version.h>
+#endif
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavfilter/avfilter.h>
 #include <libswscale/swscale.h>
-#include <libavfilter/avfiltergraph.h>
 #include <libavutil/pixfmt.h>
 }
 #include <boost/thread.hpp>
@@ -56,28 +65,30 @@ static
 string
 ffmpeg_version_to_string (int v)
 {
-	SafeStringStream s;
-	s << ((v & 0xff0000) >> 16) << N_(".") << ((v & 0xff00) >> 8) << N_(".") << (v & 0xff);
-	return s.str ();
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), "%d.%d.%d", ((v & 0xff0000) >> 16), ((v & 0xff00) >> 8), (v & 0xff));
+	return buffer;
 }
 
-
 /** Return a user-readable string summarising the versions of our dependencies */
 static
 string
 dependency_version_summary ()
 {
-	SafeStringStream s;
-	s << N_("libavcodec ") << ffmpeg_version_to_string (avcodec_version()) << N_(", ")
-	  << N_("libavfilter ") << ffmpeg_version_to_string (avfilter_version()) << N_(", ")
-	  << N_("libavformat ") << ffmpeg_version_to_string (avformat_version()) << N_(", ")
-	  << N_("libavutil ") << ffmpeg_version_to_string (avutil_version()) << N_(", ")
-	  << N_("libswscale ") << ffmpeg_version_to_string (swscale_version()) << N_(", ")
-	  << MagickVersion << N_(", ")
-	  << N_("libssh ") << ssh_version (0) << N_(", ")
-	  << N_("libdcp ") << dcp::version << N_(" git ") << dcp::git_commit;
-
-	return s.str ();
+	char buffer[512];
+	snprintf (
+		buffer, sizeof(buffer), "libavcodec %s, libavfilter %s, libavformat %s, libavutil %s, libswscale %s, %s, libssh %s, libdcp %s git %s",
+		ffmpeg_version_to_string(avcodec_version()).c_str(),
+		ffmpeg_version_to_string(avfilter_version()).c_str(),
+		ffmpeg_version_to_string(avformat_version()).c_str(),
+		ffmpeg_version_to_string(avutil_version()).c_str(),
+		ffmpeg_version_to_string(swscale_version()).c_str(),
+		MagickVersion,
+		ssh_version(0),
+		dcp::version, dcp::git_commit
+		);
+
+	return buffer;
 }
 
 list<string>
@@ -90,7 +101,7 @@ environment_info ()
 	{
 		char buffer[128];
 		gethostname (buffer, sizeof (buffer));
-		info.push_back (String::compose ("Host name %1", buffer));
+		info.push_back (String::compose ("Host name %1", &buffer[0]));
 	}
 
 #ifdef DCPOMATIC_DEBUG
@@ -105,10 +116,30 @@ environment_info ()
 #endif
 
 #ifdef DCPOMATIC_WINDOWS
-	OSVERSIONINFO info;
-	info.dwOSVersionInfoSize = sizeof (info);
-	GetVersionEx (&info);
-	info.push_back (String::compose ("Windows version %1.%2.%3 SP %4", info.dwMajorVersion, info.dwMinorVersion, info.dwBuildNumber, info.szCSDVersion));
+	OSVERSIONINFO os_info;
+	os_info.dwOSVersionInfoSize = sizeof (os_info);
+	GetVersionEx (&os_info);
+	info.push_back (
+		String::compose (
+			"Windows version %1.%2.%3",
+			(int) os_info.dwMajorVersion, (int) os_info.dwMinorVersion, (int) os_info.dwBuildNumber
+			)
+		);
+	if (os_info.dwMajorVersion == 5 && os_info.dwMinorVersion == 0) {
+		info.push_back ("Windows 2000");
+	} else if (os_info.dwMajorVersion == 5 && os_info.dwMinorVersion == 1) {
+		info.push_back ("Windows XP");
+	} else if (os_info.dwMajorVersion == 5 && os_info.dwMinorVersion == 2) {
+		info.push_back ("Windows XP 64-bit or Windows Server 2003");
+	} else if (os_info.dwMajorVersion == 6 && os_info.dwMinorVersion == 0) {
+		info.push_back ("Windows Vista or Windows Server 2008");
+	} else if (os_info.dwMajorVersion == 6 && os_info.dwMinorVersion == 1) {
+		info.push_back ("Windows 7 or Windows Server 2008");
+	} else if (os_info.dwMajorVersion == 6 && (os_info.dwMinorVersion == 2 || os_info.dwMinorVersion == 3)) {
+		info.push_back ("Windows 8 or Windows Server 2012");
+	} else if (os_info.dwMajorVersion == 10 && os_info.dwMinorVersion == 0) {
+		info.push_back ("Windows 10 or Windows Server 2016");
+	}
 #endif
 
 #if __GNUC__