X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftools%2Fdcpomatic_server.cc;h=7dcb82350e4a90547c146f94060f12f983d8ebe9;hb=f3af8abbf6fef460f7c9224d75d70b17cdf6dead;hp=6cf0a9609d518ddfb2970627abc216286e90607e;hpb=3c29aa6531a4046a8db72dcac81189eb8893233c;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 6cf0a9609..7dcb82350 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -25,6 +25,9 @@
 #include "lib/encoded_log_entry.h"
 #include "lib/encode_server.h"
 #include "lib/config.h"
+#ifdef DCPOMATIC_GROK
+#include "lib/grok/context.h"
+#endif
 #include "lib/log.h"
 #include "lib/signaller.h"
 #include "lib/cross.h"
@@ -243,7 +246,7 @@ public:
 #else
 		string const colour = gui_is_dark() ? "white" : "black";
 		wxBitmap bitmap (
-			bitmap_path(String::compose("dcpomatic_small_%1", colour)),
+			bitmap_path(String::compose("dcpomatic_small_%1.png", colour)),
 			wxBITMAP_TYPE_PNG
 			);
 		wxIcon icon;
@@ -287,7 +290,7 @@ private:
 		server_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
 		dcpomatic_log = server_log;
 
-		Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+		Config::FailedToLoad.connect(boost::bind(&App::config_failed_to_load, this, _1));
 		Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
 
 		auto splash = maybe_show_splash ();
@@ -326,6 +329,11 @@ private:
 
 		SetExitOnFrameDelete (false);
 
+#ifdef DCPOMATIC_GROK
+		grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] "));
+		setup_grok_library_path();
+#endif
+
 		return true;
 	}
 
@@ -361,9 +369,9 @@ private:
 		signal_manager->ui_idle ();
 	}
 
-	void config_failed_to_load ()
+	void config_failed_to_load(Config::LoadFailure what)
 	{
-		message_dialog (nullptr, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
+		report_config_load_failure(nullptr, what);
 	}
 
 	void config_warning (string m)