X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=fe70ec6f716dade9aaa3f19b4cce98baea2101e6;hp=bbdd191356ff712dd16e7ae387827e477c7eb6d8;hb=439b5d7a315daf2422cb6c995110d628a91d9389;hpb=6094de79985e405ed8b3c26af22e067a3317cda2 diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index bbdd19135..fe70ec6f7 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -1,50 +1,60 @@ /* Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #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" #include "lib/config.h" #include "lib/log.h" -#include "lib/raw_convert.h" #include "lib/signaller.h" #include "lib/cross.h" -#include +#include "lib/dcpomatic_log.h" +#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, @@ -54,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; @@ -80,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); @@ -103,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) { @@ -119,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; @@ -130,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); @@ -190,80 +205,92 @@ private: void update_state () { - SafeStringStream s; - s << fixed << setprecision(1) << server_log->fps (); - _fps->SetLabel (std_to_wx (s.str())); + _fps->SetLabel (wxString::Format ("%.1f", server_log->fps())); } 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 ("taskbar_icon")); -#else - wxInitAllImageHandlers(); - wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_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_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::status, this), ID_status); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::quit, this), ID_quit); + 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)); + + auto splash = maybe_show_splash (); dcpomatic_setup_path_encoding (); dcpomatic_setup_i18n (); @@ -273,17 +300,36 @@ 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)); _timer->Start (1000); + if (splash) { + splash->Destroy (); + } + + SetExitOnFrameDelete (false); + return true; } - int OnExit () + int OnExit () override { delete _icon; return wxApp::OnExit (); @@ -291,7 +337,7 @@ private: void main_thread () try { - EncodeServer server (server_log, false, Config::instance()->num_local_encoding_threads()); + EncodeServer server (false, Config::instance()->server_encoding_threads()); server.run (); } catch (...) { store_current (); @@ -302,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 (); } } @@ -315,8 +361,18 @@ private: signal_manager->ui_idle (); } - boost::thread* _thread; - TaskBarIcon* _icon; + void config_failed_to_load () + { + 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 (nullptr, std_to_wx(m)); + } + + boost::thread _thread; + TaskBarIcon* _icon = nullptr; shared_ptr _timer; };