X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=37fcc34cdadc91603f6feb52e3cb8c2ebfe76490;hb=4d9f56686380aed5eb3e17ab9e720df57a17f079;hp=152e063c1e59104b78d5f280bdfa0a3973e4b3df;hpb=92cafb6fc686a041354da2eabde6bcb2f6846e1d;p=dcpomatic.git diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 152e063c1..37fcc34cd 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,16 +17,23 @@ */ -#include -#include -#include -#include "wx_util.h" +#include "wx/wx_util.h" +#include "wx/wx_signal_manager.h" #include "lib/util.h" #include "lib/server.h" #include "lib/config.h" +#include "lib/log.h" +#include "lib/signaller.h" +#include +#include +#include +#include +#include using std::cout; using std::string; +using std::exception; +using std::list; using boost::shared_ptr; using boost::thread; using boost::bind; @@ -37,22 +44,40 @@ enum { ID_timer }; -class MemoryLog : public Log +static int const log_lines = 32; + +class MemoryLog : 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) const { + /* Not necessary */ + return ""; } + boost::signals2::signal Appended; + boost::signals2::signal Removed; + private: void do_log (string m) { - _log = m; + _log.push_back (m); + emit (boost::bind (boost::ref (Appended), m)); + if (_log.size() > log_lines) { + emit (boost::bind (boost::ref (Removed), _log.front().length())); + _log.pop_front (); + } } - string _log; + list _log; }; static shared_ptr memory_log (new MemoryLog); @@ -61,54 +86,70 @@ 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 = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP); _sizer->AddGrowableCol (0, 1); - _text = new wxTextCtrl (this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - _sizer->Add (_text, 1, wxEXPAND); + 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 (memory_log->get()), wxDefaultPosition, wxSize (-1, height), + wxTE_READONLY | wxTE_MULTILINE + ); + + _sizer->Add (_text, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); SetSizer (_sizer); _sizer->Layout (); - Connect (ID_timer, wxEVT_TIMER, wxTimerEventHandler (StatusDialog::update)); - _timer.Start (1000); + memory_log->Appended.connect (bind (&StatusDialog::appended, this, _1)); + memory_log->Removed.connect (bind (&StatusDialog::removed, this, _1)); } private: - void update (wxTimerEvent &) + void appended (string s) { - _text->ChangeValue (std_to_wx (memory_log->get ())); - _sizer->Layout (); + (*_text) << s << "\n"; + } + + void removed (int n) + { + _text->Remove (0, n + 1); } wxFlexGridSizer* _sizer; wxTextCtrl* _text; - wxTimer _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"), POSIX_ICON_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 +#endif + SetIcon (icon, std_to_wx ("DCP-o-matic encode server")); - Connect (ID_status, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::status)); - Connect (ID_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::quit)); + 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; @@ -118,19 +159,23 @@ public: } private: - void status (wxCommandEvent &) + void status () { - StatusDialog* d = new StatusDialog; - d->Show (); + if (!_status) { + _status = new StatusDialog (); + } + _status->Show (); } - void quit (wxCommandEvent &) + void quit () { wxTheApp->ExitMainLoop (); } + + StatusDialog* _status; }; -class App : public wxApp +class App : public wxApp, public ExceptionStore { public: App () @@ -139,19 +184,29 @@ 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)); - + + Bind (wxEVT_TIMER, boost::bind (&App::check, this)); + _timer.reset (new wxTimer (this)); + _timer->Start (1000); + return true; } @@ -162,13 +217,34 @@ private: } void main_thread () - { - Server server (memory_log); + try { + Server server (memory_log, false); server.run (Config::instance()->num_local_encoding_threads ()); + } catch (...) { + store_current (); + } + + void check () + { + try { + rethrow (); + } catch (exception& e) { + error_dialog (0, std_to_wx (e.what ())); + wxTheApp->ExitMainLoop (); + } catch (...) { + error_dialog (0, _("An unknown error has occurred with the DCP-o-matic server.")); + wxTheApp->ExitMainLoop (); + } + } + + void idle () + { + signal_manager->ui_idle (); } boost::thread* _thread; TaskBarIcon* _icon; + shared_ptr _timer; }; IMPLEMENT_APP (App)