More player debugging for butler video-full states.

[dcpomatic.git] / src / lib / environment_info.cc

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index eb241d512489579d5e7dcc8fff1139d549186fdd..31279acfbf539b1be227542d9194af3ebd4a0ab2 100644 (file)
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -24,27 +24,17 @@
 #include "cross.h"
 #include <dcp/version.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>
 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>
 }
 #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;
@@ -57,28 +47,29 @@ static
 string
 ffmpeg_version_to_string (int v)
 {
-       locked_stringstream 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;
 }
 
-
 /** Return a user-readable string summarising the versions of our dependencies */
 static
 string
 dependency_version_summary ()
 {
-       locked_stringstream 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<string>
@@ -91,7 +82,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
@@ -111,10 +102,25 @@ environment_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
+                       "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__