/*
- 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 "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>
#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.
return buffer;
}
+
/** Return a user-readable string summarising the versions of our dependencies */
static
string
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
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
)
#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;