diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-07 22:15:01 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-07 22:15:01 +0200 |
| commit | 7bc2134d658778e04f1756c255e604b4ab5a5831 (patch) | |
| tree | b5ba51f2534604a6528fbbb130fd0cfca7d6fb70 /src/lib/environment_info.cc | |
| parent | a771a806291243760552988a1a7a5742bc007ee2 (diff) | |
Assorted C++11/formatting cleanups.
Diffstat (limited to 'src/lib/environment_info.cc')
| -rw-r--r-- | src/lib/environment_info.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc index 5b1f56f72..7a8fe68bc 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,6 +18,7 @@ */ + #include "log.h" #include "compose.hpp" #include "version.h" @@ -35,10 +36,12 @@ extern "C" { #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 +55,7 @@ ffmpeg_version_to_string (int v) return buffer; } + /** Return a user-readable string summarising the versions of our dependencies */ static string @@ -72,6 +76,7 @@ dependency_version_summary () return buffer; } + list<string> environment_info () { @@ -133,10 +138,9 @@ environment_info () #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; |