Use dcp::compose rather than our own.

[dcpomatic.git] / src / lib / environment_info.cc

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index fd44100cd490adcf67d6f9687f0a40a2d39d4d5d..d7ac75ccbd6cd88fbc9584a2ee22a730c709652b 100644 (file)
--- 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,12 +18,15 @@
 
 */
 
+
+#include "cross.h"
 #include "log.h"
-#include "compose.hpp"
 #include "version.h"
-#include "cross.h"
+#include "warnings.h"
+#include <dcp/compose.h>
 #include <dcp/version.h>
 #include <libssh/libssh.h>
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -31,14 +34,17 @@ extern "C" {
 #include <libswscale/swscale.h>
 #include <libavutil/pixfmt.h>
 }
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 #include "i18n.h"
 
-using std::string;
+
 using std::list;
 using std::pair;
 using std::shared_ptr;
+using std::string;
+
 
 /** @param v Version as used by FFmpeg.
  *  @return A string representation of v.
@@ -52,6 +58,7 @@ ffmpeg_version_to_string (int v)
        return buffer;
 }
 
+
 /** Return a user-readable string summarising the versions of our dependencies */
 static
 string
@@ -72,17 +79,18 @@ dependency_version_summary ()
        return buffer;
 }
 
+
 list<string>
 environment_info ()
 {
        list<string> info;
 
-       info.push_back (String::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary()));
+       info.push_back (dcp::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary()));
 
        {
                char buffer[128];
                gethostname (buffer, sizeof (buffer));
-               info.push_back (String::compose ("Host name %1", &buffer[0]));
+               info.push_back (dcp::compose ("Host name %1", &buffer[0]));
        }
 
 #ifdef DCPOMATIC_DEBUG
@@ -101,7 +109,7 @@ environment_info ()
        os_info.dwOSVersionInfoSize = sizeof (os_info);
        GetVersionEx (&os_info);
        info.push_back (
-               String::compose (
+               dcp::compose (
                        "Windows version %1.%2.%3",
                        (int) os_info.dwMajorVersion, (int) os_info.dwMinorVersion, (int) os_info.dwBuildNumber
                        )
@@ -125,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 (dcp::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency()));
+       for (auto const& i: mount_info()) {
+               info.push_back (dcp::compose("Mount: %1 %2", i.first, i.second));
        }
 
        return info;