X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=401fb1077d047c83921f329d1570f8413f6fe3ae;hb=6ce5b203f7b056422d6b94dd97100ae0e79dfa08;hp=1554c02f4541ff11374b06ceddc41afffc5c43f3;hpb=25c15064f4c816d310c34e2e27092b3c2d02afb3;p=dcpomatic.git diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 1554c02f4..401fb1077 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 #include #include +DCPOMATIC_ENABLE_WARNINGS #include -#include #include #include @@ -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, @@ -57,6 +62,7 @@ enum { static unsigned int const log_lines = 32; + class ServerLog : public Log, public Signaller { public: @@ -66,17 +72,12 @@ public: 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; @@ -109,7 +110,7 @@ private: } _last_time = *local; - shared_ptr encoded = dynamic_pointer_cast (entry); + auto encoded = dynamic_pointer_cast (entry); if (encoded) { _history.push_back (encoded->seconds ()); if (_history.size() > 48) { @@ -125,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 _log; @@ -136,14 +137,16 @@ private: float _fps; }; + static shared_ptr 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 @@ -152,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); @@ -205,24 +208,19 @@ private: wxTextCtrl* _text; wxStaticText* _fps; - boost::shared_ptr _timer; + std::shared_ptr _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 (shared_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); @@ -230,43 +228,54 @@ 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; } + 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", 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 () - , _thread (0) - , _icon (0) {} private: bool OnInit () { - if (!wxApp::OnInit ()) { + if (!wxApp::OnInit()) { return false; } @@ -279,7 +288,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 (); @@ -296,13 +305,14 @@ 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 = new thread (bind (&App::main_thread, this)); + _thread = thread (bind (&App::main_thread, this)); Bind (wxEVT_TIMER, boost::bind (&App::check, this)); _timer.reset (new wxTimer (this)); @@ -336,10 +346,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 +361,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; + boost::thread _thread; + TaskBarIcon* _icon = nullptr; shared_ptr _timer; };