X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=e5e3a7e5a072e6a5838f8ff40e149cd49e3bae51;hb=f5bd787fb71466a6187050086b2890b9b0ac9294;hp=c59fefe8f3170e7a006f47a1cc4c463187417745;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index c59fefe8f..e5e3a7e5a 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -29,17 +29,17 @@
 #include "lib/signaller.h"
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/taskbar.h>
-#include <wx/splash.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/icon.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/splash.h>
+#include <wx/taskbar.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
-#include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <iostream>
 
+
 using std::cout;
 using std::string;
 using std::exception;
@@ -55,6 +55,7 @@ using std::dynamic_pointer_cast;
 using namespace boost::placeholders;
 #endif
 
+
 enum {
 	ID_status = 1,
 	ID_quit,
@@ -63,6 +64,7 @@ enum {
 
 static unsigned int const log_lines = 32;
 
+
 class ServerLog : public Log, public Signaller
 {
 public:
@@ -72,7 +74,7 @@ public:
 
 	string get () const {
 		string a;
-		BOOST_FOREACH (string const & i, _log) {
+		for (auto const& i: _log) {
 			a += i + "\n";
 		}
 		return a;
@@ -87,7 +89,7 @@ public:
 	boost::signals2::signal<void(int)> Removed;
 
 private:
-	void do_log (shared_ptr<const LogEntry> entry)
+	void do_log (shared_ptr<const LogEntry> entry) override
 	{
 		time_t const s = entry->seconds ();
 		struct tm* local = localtime (&s);
@@ -110,7 +112,7 @@ private:
 		}
 		_last_time = *local;
 
-		shared_ptr<const EncodedLogEntry> encoded = dynamic_pointer_cast<const EncodedLogEntry> (entry);
+		auto encoded = dynamic_pointer_cast<const EncodedLogEntry> (entry);
 		if (encoded) {
 			_history.push_back (encoded->seconds ());
 			if (_history.size() > 48) {
@@ -126,7 +128,7 @@ private:
 	void append (string s)
 	{
 		_log.push_back (s);
-		emit (boost::bind (boost::ref (Appended), s));
+		emit (boost::bind(boost::ref(Appended), s));
 	}
 
 	list<string> _log;
@@ -137,14 +139,16 @@ private:
 	float _fps;
 };
 
+
 static shared_ptr<ServerLog> server_log;
 
+
 class StatusDialog : public wxDialog
 {
 public:
 	StatusDialog ()
 		: wxDialog (
-			0, wxID_ANY, _("DCP-o-matic Encode Server"),
+			nullptr, wxID_ANY, _("DCP-o-matic Encode Server"),
 			wxDefaultPosition, wxDefaultSize,
 #ifdef DCPOMATIC_OSX
 			wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxSTAY_ON_TOP
@@ -153,13 +157,13 @@ public:
 #endif
 			)
 	{
-		wxFlexGridSizer* state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
+		auto state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
 
 		add_label_to_sizer (state_sizer, this, _("Frames per second"), true);
 		_fps = new StaticText (this, wxT(""));
 		state_sizer->Add (_fps);
 
-		wxFlexGridSizer* log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
+		auto log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
 		log_sizer->AddGrowableCol (0, 1);
 
 		wxClientDC dc (this);
@@ -209,64 +213,71 @@ private:
 	std::shared_ptr<wxTimer> _timer;
 };
 
+
+static StatusDialog* status_dialog = nullptr;
+
+
 class TaskBarIcon : public wxTaskBarIcon
 {
 public:
 	TaskBarIcon ()
-		: _status (0)
 	{
-#ifdef DCPOMATIC_WINDOWS
-		wxIcon icon (std_to_wx ("id"));
-#else
-		wxBitmap bitmap (wxString::Format(wxT("%s/dcpomatic_small.png"), std_to_wx(resources_path().string())), wxBITMAP_TYPE_PNG);
-		wxIcon icon;
-		icon.CopyFromBitmap (bitmap);
-#endif
-
-		SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
+		set_icon ();
 
 		Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::status, this), ID_status);
 		Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::quit, this), ID_quit);
 	}
 
-	wxMenu* CreatePopupMenu ()
+	wxMenu* CreatePopupMenu () override
 	{
-		wxMenu* menu = new wxMenu;
+		auto menu = new wxMenu;
 		menu->Append (ID_status, std_to_wx ("Status..."));
 		menu->Append (ID_quit, std_to_wx ("Quit"));
 		return menu;
 	}
 
+	void set_icon ()
+	{
+#ifdef DCPOMATIC_WINDOWS
+		wxIcon icon (std_to_wx("id"));
+#else
+		string const colour = gui_is_dark() ? "white" : "black";
+		wxBitmap bitmap (
+			bitmap_path(String::compose("dcpomatic_small_%1.png", colour)),
+			wxBITMAP_TYPE_PNG
+			);
+		wxIcon icon;
+		icon.CopyFromBitmap (bitmap);
+#endif
+
+		SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
+	}
+
 private:
 	void status ()
 	{
-		if (!_status) {
-			_status = new StatusDialog ();
-		}
-		_status->Show ();
+		status_dialog->Show ();
 	}
 
 	void quit ()
 	{
 		wxTheApp->ExitMainLoop ();
 	}
-
-	StatusDialog* _status;
 };
 
+
 class App : public wxApp, public ExceptionStore
 {
 public:
 	App ()
 		: wxApp ()
-		, _icon (0)
 	{}
 
 private:
 
-	bool OnInit ()
+	bool OnInit () override
 	{
-		if (!wxApp::OnInit ()) {
+		if (!wxApp::OnInit()) {
 			return false;
 		}
 
@@ -276,10 +287,10 @@ 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));
 
-		wxSplashScreen* splash = maybe_show_splash ();
+		auto splash = maybe_show_splash ();
 
 		dcpomatic_setup_path_encoding ();
 		dcpomatic_setup_i18n ();
@@ -296,11 +307,12 @@ private:
 		*/
 		Config::instance();
 
+		status_dialog = new StatusDialog ();
 #ifdef DCPOMATIC_LINUX
-		StatusDialog* d = new StatusDialog ();
-		d->Show ();
+		status_dialog->Show ();
 #else
 		_icon = new TaskBarIcon;
+		status_dialog->Bind (wxEVT_SYS_COLOUR_CHANGED, boost::bind(&TaskBarIcon::set_icon, _icon));
 #endif
 		_thread = thread (bind (&App::main_thread, this));
 
@@ -317,7 +329,7 @@ private:
 		return true;
 	}
 
-	int OnExit ()
+	int OnExit () override
 	{
 		delete _icon;
 		return wxApp::OnExit ();
@@ -336,10 +348,10 @@ private:
 		try {
 			rethrow ();
 		} catch (exception& e) {
-			error_dialog (0, std_to_wx (e.what ()));
+			error_dialog (nullptr, std_to_wx(e.what()));
 			wxTheApp->ExitMainLoop ();
 		} catch (...) {
-			error_dialog (0, _("An unknown error has occurred with the DCP-o-matic server."));
+			error_dialog (nullptr, _("An unknown error has occurred with the DCP-o-matic server."));
 			wxTheApp->ExitMainLoop ();
 		}
 	}
@@ -349,18 +361,18 @@ private:
 		signal_manager->ui_idle ();
 	}
 
-	void config_failed_to_load ()
+	void config_failed_to_load(Config::LoadFailure what)
 	{
-		message_dialog (0, _("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)
 	{
-		message_dialog (0, std_to_wx (m));
+		message_dialog (nullptr, std_to_wx(m));
 	}
 
 	boost::thread _thread;
-	TaskBarIcon* _icon;
+	TaskBarIcon* _icon = nullptr;
 	shared_ptr<wxTimer> _timer;
 };