Explicitly set up Grok logger rather than relying on a static variable.

6 files changed, 14 insertions, 9 deletions

diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h
index 8e03c1d54..2513f8863 100644
--- a/src/lib/grok/context.h
+++ b/src/lib/grok/context.h
@@ -59,13 +59,6 @@ struct GrokLogger : public MessengerLogger {
 	}
 };
 
-struct GrokInitializer {
-	GrokInitializer(void) {
-		setMessengerLogger(new GrokLogger("[GROK] "));
-	}
-	~GrokInitializer()  = default;
-};
-
 struct FrameProxy {
 	FrameProxy(int index, Eyes eyes, DCPVideo dcpv) : index_(index), eyes_(eyes), vf(dcpv)
 	{}
diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index 8c7a1ef1b..c023e4bf3 100644
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -58,8 +58,6 @@ using dcp::Data;
 using namespace dcpomatic;
 
 
-static grk_plugin::GrokInitializer grokInitializer;
-
 /** @param film Film that we are encoding.
  *  @param writer Writer that we are using.
  */
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index d0a7088d1..e5c2841d0 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -76,6 +76,7 @@
 #include "lib/ffmpeg_encoder.h"
 #include "lib/film.h"
 #include "lib/font_config.h"
+#include "lib/grok/context.h"
 #include "lib/hints.h"
 #include "lib/job_manager.h"
 #include "lib/kdm_with_metadata.h"
@@ -1722,6 +1723,8 @@ private:
 				notes.Centre();
 				notes.ShowModal();
 			}
+
+			grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] "));
 		}
 		catch (exception& e)
 		{
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 3bec88c6b..66262f2eb 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -32,6 +32,7 @@
 #include "lib/config.h"
 #include "lib/dcpomatic_socket.h"
 #include "lib/film.h"
+#include "lib/grok/context.h"
 #include "lib/job.h"
 #include "lib/job_manager.h"
 #include "lib/make_dcp.h"
@@ -499,6 +500,8 @@ class App : public wxApp
 			}
 		}
 
+		grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] "));
+
 		return true;
 	}
 
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 9bdc688c8..ff6341579 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -23,6 +23,9 @@
 #include "wx/wx_signal_manager.h"
 #include "wx/wx_util.h"
 #include "lib/config.h"
+#include "lib/grok/context.h"
+#include "lib/log.h"
+#include "lib/signaller.h"
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/encode_server.h"
@@ -327,6 +330,8 @@ private:
 
 		SetExitOnFrameDelete (false);
 
+		grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] "));
+
 		return true;
 	}
 
diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index 6d7f6aba7..30f119a5e 100644
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -25,6 +25,7 @@
 #include "lib/config.h"
 #include "lib/image.h"
 #include "lib/file_log.h"
+#include "lib/grok/context.h"
 #include "lib/null_log.h"
 #include "lib/version.h"
 #include "lib/encode_server.h"
@@ -109,6 +110,8 @@ main (int argc, char* argv[])
 		dcpomatic_log.reset (new FileLog("dcpomatic_server_cli.log"));
 	}
 
+	setMessengerLogger(new grk_plugin::GrokLogger("[GROK] "));
+
 	EncodeServer server (verbose, num_threads);
 
 	try {