summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-01-06 01:11:48 +0000
committerCarl Hetherington <cth@carlh.net>2018-01-06 01:11:48 +0000
commit813465522d7e887ff944e79a7c6386dc9588bed5 (patch)
tree9e298df552603479e8f80c27283b72fc7473b4c7
parentba621566b1b801f5e43b043b4f4a5041ff09a0d0 (diff)
Add version number to encode server welcome message (#1157).
-rw-r--r--ChangeLog2
-rw-r--r--src/lib/encode_server.cc5
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 665c8572a..2199dfc7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2018-01-06 Carl Hetherington <cth@carlh.net>
+ * Add version number to encode server welcome message (#1157).
+
* Updated nl_NL translation from Rob van Nieuwkerk.
2018-01-05 Carl Hetherington <cth@carlh.net>
diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 7810cc95e..7bef82b26 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -34,6 +34,7 @@
#include "compose.hpp"
#include "log.h"
#include "encoded_log_entry.h"
+#include "version.h"
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
@@ -222,7 +223,7 @@ EncodeServer::worker_thread ()
void
EncodeServer::run ()
{
- LOG_GENERAL ("Server starting with %1 threads", _num_threads);
+ LOG_GENERAL ("Server %1 (%2) starting with %3 threads", dcpomatic_version, dcpomatic_git_commit, _num_threads);
if (_verbose) {
cout << "DCP-o-matic server starting with " << _num_threads << " threads.\n";
}