X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=4039a07ed3702e67df0bc3370386b95a64fe6312;hp=c3df55d6ffcd6fce8e2b2ce54c55f6facf6bf64a;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=95850d791c08792fbeadf63126fe527ee66b6c34

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index c3df55d6f..4039a07ed 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -29,11 +29,13 @@
 #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 <wx/icon.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/thread.hpp>
-#include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <iostream>
 
@@ -43,11 +45,14 @@ using std::exception;
 using std::list;
 using std::fixed;
 using std::setprecision;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::thread;
 using boost::bind;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 enum {
 	ID_status = 1,
@@ -60,20 +65,18 @@ static unsigned int const log_lines = 32;
 class ServerLog : public Log, public Signaller
 {
 public:
+	ServerLog ()
+		: _fps (0)
+	{}
 
 	string get () const {
 		string a;
-		BOOST_FOREACH (string const & i, _log) {
+		for (auto const& i: _log) {
 			a += i + "\n";
 		}
 		return a;
 	}
 
-	string head_and_tail (int) const {
-		/* Not necessary */
-		return "";
-	}
-
 	float fps () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _fps;
@@ -142,7 +145,11 @@ public:
 		: wxDialog (
 			0, wxID_ANY, _("DCP-o-matic Encode Server"),
 			wxDefaultPosition, wxDefaultSize,
+#ifdef DCPOMATIC_OSX
+			wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxSTAY_ON_TOP
+#else
 			wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
+#endif
 			)
 	{
 		wxFlexGridSizer* state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
@@ -198,7 +205,7 @@ private:
 
 	wxTextCtrl* _text;
 	wxStaticText* _fps;
-	boost::shared_ptr<wxTimer> _timer;
+	std::shared_ptr<wxTimer> _timer;
 };
 
 class TaskBarIcon : public wxTaskBarIcon
@@ -210,13 +217,7 @@ public:
 #ifdef DCPOMATIC_WINDOWS
 		wxIcon icon (std_to_wx ("id"));
 #else
-		wxInitAllImageHandlers();
-#ifdef DCPOMATIC_LINUX
-		wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
-#endif
-#ifdef DCPOMATIC_OSX
-		wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
-#endif
+		wxBitmap bitmap (wxString::Format(wxT("%s/dcpomatic_small.png"), std_to_wx(resources_path().string())), wxBITMAP_TYPE_PNG);
 		wxIcon icon;
 		icon.CopyFromBitmap (bitmap);
 #endif
@@ -257,7 +258,6 @@ class App : public wxApp, public ExceptionStore
 public:
 	App ()
 		: wxApp ()
-		, _thread (0)
 		, _icon (0)
 	{}
 
@@ -272,6 +272,7 @@ private:
 		wxInitAllImageHandlers ();
 
 		server_log.reset (new ServerLog);
+		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));
@@ -287,8 +288,20 @@ private:
 		signal_manager = new wxSignalManager (this);
 		Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
 
+		/* Bad things happen (on Linux at least) if the config is reloaded by main_thread;
+		   it seems like there's a race which results in the locked_sstream mutex being
+		   locked before it is initialised.  Calling Config::instance() here loads the config
+		   again in this thread, which seems to work around the problem.
+		*/
+		Config::instance();
+
+#ifdef DCPOMATIC_LINUX
+		StatusDialog* d = new StatusDialog ();
+		d->Show ();
+#else
 		_icon = new TaskBarIcon;
-		_thread = new thread (bind (&App::main_thread, this));
+#endif
+		_thread = thread (bind (&App::main_thread, this));
 
 		Bind (wxEVT_TIMER, boost::bind (&App::check, this));
 		_timer.reset (new wxTimer (this));
@@ -298,6 +311,8 @@ private:
 			splash->Destroy ();
 		}
 
+		SetExitOnFrameDelete (false);
+
 		return true;
 	}
 
@@ -343,7 +358,7 @@ private:
 		message_dialog (0, std_to_wx (m));
 	}
 
-	boost::thread* _thread;
+	boost::thread _thread;
 	TaskBarIcon* _icon;
 	shared_ptr<wxTimer> _timer;
 };