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

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index 6fb75a037..2e0347c79 100644
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,27 +18,15 @@
 
 */
 
-#include "log.h"
+
 #include "compose.hpp"
-#include "version.h"
 #include "cross.h"
+#include "log.h"
+#include "version.h"
 #include <dcp/version.h>
+#include <dcp/warnings.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>
-#include <magick/version.h>
-#endif
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -46,17 +34,17 @@ extern "C" {
 #include <libswscale/swscale.h>
 #include <libavutil/pixfmt.h>
 }
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) log->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
 
-using std::string;
 using std::list;
 using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::string;
+
 
 /** @param v Version as used by FFmpeg.
  *  @return A string representation of v.
@@ -70,6 +58,7 @@ ffmpeg_version_to_string (int v)
 	return buffer;
 }
 
+
 /** Return a user-readable string summarising the versions of our dependencies */
 static
 string
@@ -77,13 +66,12 @@ dependency_version_summary ()
 {
 	char buffer[512];
 	snprintf (
-		buffer, sizeof(buffer), "libavcodec %s, libavfilter %s, libavformat %s, libavutil %s, libswscale %s, %s, libssh %s, libdcp %s git %s",
+		buffer, sizeof(buffer), "libavcodec %s, libavfilter %s, libavformat %s, libavutil %s, libswscale %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
 		);
@@ -91,6 +79,7 @@ dependency_version_summary ()
 	return buffer;
 }
 
+
 list<string>
 environment_info ()
 {
@@ -144,16 +133,17 @@ environment_info ()
 
 #if __GNUC__
 #if __x86_64__
-	info.push_back ("Built for 64-bit");
+	info.push_back ("Built for x86 64-bit");
+#elif __aarch64__
+	info.push_back ("Built for ARM 64-bit");
 #else
-	info.push_back ("Built for 32-bit");
+	info.push_back ("Built for x86 32-bit");
 #endif
 #endif
 
-	info.push_back (String::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency ()));
-	list<pair<string, string> > const m = mount_info ();
-	for (list<pair<string, string> >::const_iterator i = m.begin(); i != m.end(); ++i) {
-		info.push_back (String::compose ("Mount: %1 %2", i->first, i->second));
+	info.push_back (String::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency()));
+	for (auto const& i: mount_info()) {
+		info.push_back (String::compose("Mount: %1 %2", i.first, i.second));
 	}
 
 	return info;