X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=80d4046a494a9283c7952258e0d08b2494608bfa;hp=b51f29c15cd1fc6d31b2155f044499142e9b1ae5;hb=ecc74ec418e060fa163d25d08a62a6e81eece114;hpb=e3c78ffdb5e562841e86e6f59a20494159c44de7

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index b51f29c15..80d4046a4 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -36,7 +36,6 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/icon.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <boost/thread.hpp>
-#include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <iostream>
 
@@ -46,11 +45,11 @@ 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
@@ -63,6 +62,7 @@ enum {
 
 static unsigned int const log_lines = 32;
 
+
 class ServerLog : public Log, public Signaller
 {
 public:
@@ -72,7 +72,7 @@ public:
 
 	string get () const {
 		string a;
-		BOOST_FOREACH (string const & i, _log) {
+		for (auto const& i: _log) {
 			a += i + "\n";
 		}
 		return a;
@@ -110,7 +110,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 +126,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 +137,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 +155,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);
@@ -206,19 +208,18 @@ private:
 
 	wxTextCtrl* _text;
 	wxStaticText* _fps;
-	boost::shared_ptr<wxTimer> _timer;
+	std::shared_ptr<wxTimer> _timer;
 };
 
 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);
+		wxBitmap bitmap (bitmap_path("dcpomatic_small_black"), wxBITMAP_TYPE_PNG);
 		wxIcon icon;
 		icon.CopyFromBitmap (bitmap);
 #endif
@@ -231,7 +232,7 @@ public:
 
 	wxMenu* CreatePopupMenu ()
 	{
-		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;
@@ -254,19 +255,19 @@ private:
 	StatusDialog* _status;
 };
 
+
 class App : public wxApp, public ExceptionStore
 {
 public:
 	App ()
 		: wxApp ()
-		, _icon (0)
 	{}
 
 private:
 
 	bool OnInit ()
 	{
-		if (!wxApp::OnInit ()) {
+		if (!wxApp::OnInit()) {
 			return false;
 		}
 
@@ -279,7 +280,7 @@ private:
 		Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
 		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 ();
@@ -336,10 +337,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 ();
 		}
 	}
@@ -351,16 +352,16 @@ private:
 
 	void config_failed_to_load ()
 	{
-		message_dialog (0, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
+		message_dialog (nullptr, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
 	}
 
 	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;
 };