X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=d876832800153abb4db97fa5580fbffbb664ac50;hp=8107949f5a9a4950e5661c728bc57eec15c74970;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=a5e87b6f0f496f4ed71d9129d40a5baebb68495f diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 8107949f5..d87683280 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,20 +17,33 @@ */ -#include -#include -#include #include "wx/wx_util.h" +#include "wx/wx_signal_manager.h" #include "lib/util.h" +#include "lib/encoded_log_entry.h" #include "lib/server.h" #include "lib/config.h" +#include "lib/log.h" +#include "lib/raw_convert.h" +#include "lib/signaller.h" +#include +#include +#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 boost::thread; using boost::bind; +using boost::optional; +using boost::dynamic_pointer_cast; enum { ID_status = 1, @@ -38,89 +51,175 @@ enum { ID_timer }; -class MemoryLog : public Log +static int const log_lines = 32; + +class ServerLog : public Log, public Signaller { public: string get () const { - boost::mutex::scoped_lock (_mutex); - return _log; + string a; + BOOST_FOREACH (string const & i, _log) { + a += i + "\n"; + } + return a; } - string head_and_tail (int amount = 1024) const { - if (int (_log.size ()) < (2 * amount)) { - return _log; - } + string head_and_tail (int) const { + /* Not necessary */ + return ""; + } - return _log.substr (0, amount) + _log.substr (_log.size() - amount - 1, amount); + float fps () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _fps; } + boost::signals2::signal Appended; + boost::signals2::signal Removed; + private: - void do_log (string m) + void do_log (shared_ptr entry) { - _log = m; + time_t const s = entry->seconds (); + struct tm* local = localtime (&s); + if ( + !_last_time || + local->tm_yday != _last_time->tm_yday || + local->tm_year != _last_time->tm_year || + local->tm_hour != _last_time->tm_hour || + local->tm_min != _last_time->tm_min + ) { + char buffer[64]; + strftime (buffer, 64, "%c", local); + append (buffer); + } + + append (entry->message ()); + if (_log.size() > log_lines) { + emit (boost::bind (boost::ref (Removed), _log.front().length())); + _log.pop_front (); + } + _last_time = *local; + + shared_ptr encoded = dynamic_pointer_cast (entry); + if (encoded) { + _history.push_back (encoded->seconds ()); + if (_history.size() > 48) { + _history.pop_front (); + } + if (_history.size() > 2) { + boost::mutex::scoped_lock lm (_state_mutex); + _fps = _history.size() / (_history.back() - _history.front()); + } + } + } + + void append (string s) + { + _log.push_back (s); + emit (boost::bind (boost::ref (Appended), s)); } - string _log; + list _log; + optional _last_time; + std::list _history; + + mutable boost::mutex _state_mutex; + float _fps; }; -static shared_ptr memory_log (new MemoryLog); +static shared_ptr server_log (new ServerLog); class StatusDialog : public wxDialog { public: StatusDialog () - : wxDialog (0, wxID_ANY, _("DCP-o-matic encode server"), wxDefaultPosition, wxSize (600, 80), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) - , _timer (this, ID_timer) + : wxDialog ( + 0, wxID_ANY, _("DCP-o-matic encode server"), + wxDefaultPosition, wxDefaultSize, + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER + ) { - _sizer = new wxFlexGridSizer (1, 6, 6); - _sizer->AddGrowableCol (0, 1); + wxFlexGridSizer* 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("")); + state_sizer->Add (_fps); + + wxFlexGridSizer* log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP); + log_sizer->AddGrowableCol (0, 1); + + wxClientDC dc (this); + wxSize size = dc.GetTextExtent (wxT ("This is the length of the file label it should be quite long")); + int const height = (size.GetHeight() + 2) * log_lines; + SetSize (700, height + DCPOMATIC_SIZER_GAP * 2); + + _text = new wxTextCtrl ( + this, wxID_ANY, std_to_wx (server_log->get()), wxDefaultPosition, wxSize (-1, height), + wxTE_READONLY | wxTE_MULTILINE + ); - _text = new wxTextCtrl (this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - _sizer->Add (_text, 1, wxEXPAND); + log_sizer->Add (_text, 1, wxEXPAND); - SetSizer (_sizer); - _sizer->Layout (); + wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + overall_sizer->Add (state_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP); + overall_sizer->Add (log_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); + SetSizer (overall_sizer); + overall_sizer->Layout (); - Bind (wxEVT_TIMER, boost::bind (&StatusDialog::update, this), ID_timer); - _timer.Start (1000); + Bind (wxEVT_TIMER, boost::bind (&StatusDialog::update_state, this)); + _timer.reset (new wxTimer (this)); + _timer->Start (1000); + + server_log->Appended.connect (bind (&StatusDialog::appended, this, _1)); + server_log->Removed.connect (bind (&StatusDialog::removed, this, _1)); } private: - void update () + void appended (string s) + { + (*_text) << s << "\n"; + } + + void removed (int n) { - _text->ChangeValue (std_to_wx (memory_log->get ())); - _sizer->Layout (); + _text->Remove (0, n + 1); + } + + void update_state () + { + SafeStringStream s; + s << fixed << setprecision(1) << server_log->fps (); + _fps->SetLabel (std_to_wx (s.str())); } - wxFlexGridSizer* _sizer; wxTextCtrl* _text; - wxTimer _timer; + wxStaticText* _fps; + boost::shared_ptr _timer; }; class TaskBarIcon : public wxTaskBarIcon { public: TaskBarIcon () + : _status (0) { -#ifdef __WXMSW__ +#ifdef DCPOMATIC_WINDOWS wxIcon icon (std_to_wx ("taskbar_icon")); -#endif -#ifdef __WXGTK__ +#else wxInitAllImageHandlers(); - wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG); + wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG); wxIcon icon; icon.CopyFromBitmap (bitmap); #endif -#ifndef __WXOSX__ - /* XXX: fix this for OS X */ + SetIcon (icon, std_to_wx ("DCP-o-matic encode server")); -#endif Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::status, this), ID_status); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::quit, this), ID_quit); } - + wxMenu* CreatePopupMenu () { wxMenu* menu = new wxMenu; @@ -132,14 +231,18 @@ public: private: void status () { - StatusDialog* d = new StatusDialog; - d->Show (); + if (!_status) { + _status = new StatusDialog (); + } + _status->Show (); } void quit () { wxTheApp->ExitMainLoop (); } + + StatusDialog* _status; }; class App : public wxApp, public ExceptionStore @@ -151,15 +254,21 @@ public: , _icon (0) {} -private: - +private: + bool OnInit () { if (!wxApp::OnInit ()) { return false; } - + + dcpomatic_setup_path_encoding (); + dcpomatic_setup_i18n (); dcpomatic_setup (); + Config::drop (); + + signal_manager = new wxSignalManager (this); + Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); _icon = new TaskBarIcon; _thread = new thread (bind (&App::main_thread, this)); @@ -167,7 +276,7 @@ private: Bind (wxEVT_TIMER, boost::bind (&App::check, this)); _timer.reset (new wxTimer (this)); _timer->Start (1000); - + return true; } @@ -179,7 +288,7 @@ private: void main_thread () try { - Server server (memory_log, false); + Server server (server_log, false); server.run (Config::instance()->num_local_encoding_threads ()); } catch (...) { store_current (); @@ -198,6 +307,11 @@ private: } } + void idle () + { + signal_manager->ui_idle (); + } + boost::thread* _thread; TaskBarIcon* _icon; shared_ptr _timer;