/*
- 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.
*/
-#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
-#include <magick/MagickCore.h>
-#else
-#include <magick/common.h>
-#include <magick/magick_config.h>
-#endif
-#include <magick/version.h>
+LIBDCP_DISABLE_WARNINGS
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>
}
+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.
return buffer;
}
+
/** Return a user-readable string summarising the versions of our dependencies */
static
string
{
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
);
return buffer;
}
+
list<string>
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;