X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=fe70ec6f716dade9aaa3f19b4cce98baea2101e6;hp=64bbb3049504139195485572cd6f46b78ec11bf6;hb=439b5d7a315daf2422cb6c995110d628a91d9389;hpb=ad1ef39eda58b3a919ea3b7084401a0439409ec6 diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 64bbb3049..fe70ec6f7 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -20,6 +20,7 @@ #include "wx/wx_util.h" #include "wx/wx_signal_manager.h" +#include "wx/static_text.h" #include "lib/util.h" #include "lib/encoded_log_entry.h" #include "lib/encode_server.h" @@ -28,25 +29,32 @@ #include "lib/signaller.h" #include "lib/cross.h" #include "lib/dcpomatic_log.h" -#include -#include +#include +LIBDCP_DISABLE_WARNINGS #include +#include +#include +LIBDCP_ENABLE_WARNINGS #include -#include #include #include + using std::cout; using std::string; 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, @@ -56,23 +64,22 @@ enum { 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; @@ -82,7 +89,7 @@ public: boost::signals2::signal Removed; private: - void do_log (shared_ptr entry) + void do_log (shared_ptr entry) override { time_t const s = entry->seconds (); struct tm* local = localtime (&s); @@ -105,7 +112,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) { @@ -121,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 _log; @@ -132,25 +139,31 @@ 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 +#else wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER +#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 wxStaticText (this, wxID_ANY, wxT("")); + _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); @@ -197,84 +210,87 @@ 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 - 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 - 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 () - , _thread (0) - , _icon (0) {} private: - bool OnInit () + bool OnInit () override { - if (!wxApp::OnInit ()) { + if (!wxApp::OnInit()) { return false; } + 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)); 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 (); @@ -284,8 +300,21 @@ 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(); + + status_dialog = new StatusDialog (); +#ifdef DCPOMATIC_LINUX + status_dialog->Show (); +#else _icon = new TaskBarIcon; - _thread = new thread (bind (&App::main_thread, this)); + status_dialog->Bind (wxEVT_SYS_COLOUR_CHANGED, boost::bind(&TaskBarIcon::set_icon, _icon)); +#endif + _thread = thread (bind (&App::main_thread, this)); Bind (wxEVT_TIMER, boost::bind (&App::check, this)); _timer.reset (new wxTimer (this)); @@ -295,10 +324,12 @@ private: splash->Destroy (); } + SetExitOnFrameDelete (false); + return true; } - int OnExit () + int OnExit () override { delete _icon; return wxApp::OnExit (); @@ -317,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 (); } } @@ -332,16 +363,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; };