X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fenvironment_info.cc;h=810e24d66e6ee5a1ede5e5aa664c8ca7c6d4ecbd;hb=761b1587bab3870584833e4299156dfea6d70f63;hp=ecb80fc148a50989fbcfd68fd72ecbbf62764d87;hpb=aeb835a18c8df347e0ed68fb24631b320abeb611;p=dcpomatic.git

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index ecb80fc14..810e24d66 100644
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -22,7 +23,6 @@
 #include "version.h"
 #include "cross.h"
 #include <dcp/version.h>
-#include <openjpeg.h>
 #include <libssh/libssh.h>
 #ifdef DCPOMATIC_IMAGE_MAGICK
 #include <magick/MagickCore.h>
@@ -69,8 +69,7 @@ string
 dependency_version_summary ()
 {
 	SafeStringStream s;
-	s << N_("libopenjpeg ") << opj_version () << N_(", ")
-	  << N_("libavcodec ") << ffmpeg_version_to_string (avcodec_version()) << N_(", ")
+	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_(", ")
@@ -82,46 +81,55 @@ dependency_version_summary ()
 	return s.str ();
 }
 
-void
-environment_info (shared_ptr<Log> log)
+list<string>
+environment_info ()
 {
-	LOG_GENERAL ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary());
+	list<string> info;
+
+	info.push_back (String::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary()));
 
 	{
 		char buffer[128];
 		gethostname (buffer, sizeof (buffer));
-		LOG_GENERAL ("Host name %1", buffer);
+		info.push_back (String::compose ("Host name %1", buffer));
 	}
 
 #ifdef DCPOMATIC_DEBUG
-	LOG_GENERAL_NC ("DCP-o-matic built in debug mode.");
+	info.push_back ("DCP-o-matic built in debug mode.");
 #else
-	LOG_GENERAL_NC ("DCP-o-matic built in optimised mode.");
+	info.push_back ("DCP-o-matic built in optimised mode.");
 #endif
 #ifdef LIBDCP_DEBUG
-	LOG_GENERAL_NC ("libdcp built in debug mode.");
+	info.push_back ("libdcp built in debug mode.");
 #else
-	LOG_GENERAL_NC ("libdcp built in optimised mode.");
+	info.push_back ("libdcp built in optimised mode.");
 #endif
 
 #ifdef DCPOMATIC_WINDOWS
-	OSVERSIONINFO info;
-	info.dwOSVersionInfoSize = sizeof (info);
-	GetVersionEx (&info);
-	LOG_GENERAL ("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 SP %4",
+			os_info.dwMajorVersion, os_info.dwMinorVersion, os_info.dwBuildNumber, os_info.szCSDVersion
+			)
+		);
 #endif
 
 #if __GNUC__
 #if __x86_64__
-	LOG_GENERAL_NC ("Built for 64-bit");
+	info.push_back ("Built for 64-bit");
 #else
-	LOG_GENERAL_NC ("Built for 32-bit");
+	info.push_back ("Built for 32-bit");
 #endif
 #endif
 
-	LOG_GENERAL ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency ());
+	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) {
-		LOG_GENERAL ("Mount: %1 %2", i->first, i->second);
+		info.push_back (String::compose ("Mount: %1 %2", i->first, i->second));
 	}
+
+	return info;
 }