X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fenvironment_info.cc;h=2a6d47a005f1d077a3bea152840a9d7a05934a56;hb=4cb17f30c72c95a16be9ff2788c04fb2b74ca06f;hp=da34d5a9aff3486dc190966d46c1753a2ed9c9ce;hpb=81f361a0da4eef3ce83d003204042104d5555d39;p=dcpomatic.git diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc index da34d5a9a..2a6d47a00 100644 --- a/src/lib/environment_info.cc +++ b/src/lib/environment_info.cc @@ -1,53 +1,50 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington - 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 . */ -#include "log.h" + #include "compose.hpp" -#include "version.h" #include "cross.h" +#include "log.h" +#include "version.h" +#include "warnings.h" #include #include -#ifdef DCPOMATIC_IMAGE_MAGICK -#include -#else -#include -#include -#endif -#include +DCPOMATIC_DISABLE_WARNINGS extern "C" { #include #include +#include #include -#include #include } +DCPOMATIC_ENABLE_WARNINGS #include #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. @@ -56,9 +53,9 @@ 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; } @@ -67,19 +64,22 @@ 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, 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(), + ssh_version(0), + dcp::version, dcp::git_commit + ); + + return buffer; } + list environment_info () { @@ -90,7 +90,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,24 +105,45 @@ 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__ #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 > const m = mount_info (); - for (list >::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;