X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=b51f29c15cd1fc6d31b2155f044499142e9b1ae5;hb=03640a32d84c7c9c443351a3531fe702bbfff012;hp=3c2cd58dac2592e7f1d46c5eaa1a28a5e8e8fd9e;hpb=cfcb0f5d66cc68d8d395480a95d4fe95c63e214e;p=dcpomatic.git diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 3c2cd58da..b51f29c15 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -29,9 +29,12 @@ #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 @@ -48,6 +51,9 @@ using boost::thread; using boost::bind; using boost::optional; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif enum { ID_status = 1, @@ -60,6 +66,9 @@ static unsigned int const log_lines = 32; class ServerLog : public Log, public Signaller { public: + ServerLog () + : _fps (0) + {} string get () const { string a; @@ -69,11 +78,6 @@ public: return a; } - string head_and_tail (int) const { - /* Not necessary */ - return ""; - } - float fps () const { boost::mutex::scoped_lock lm (_state_mutex); return _fps; @@ -142,7 +146,11 @@ public: : wxDialog ( 0, 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); @@ -210,12 +218,7 @@ public: #ifdef DCPOMATIC_WINDOWS wxIcon icon (std_to_wx ("id")); #else -#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 + wxBitmap bitmap (wxString::Format(wxT("%s/dcpomatic_small.png"), std_to_wx(resources_path().string())), wxBITMAP_TYPE_PNG); wxIcon icon; icon.CopyFromBitmap (bitmap); #endif @@ -256,7 +259,6 @@ class App : public wxApp, public ExceptionStore public: App () : wxApp () - , _thread (0) , _icon (0) {} @@ -271,6 +273,7 @@ private: 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)); @@ -293,8 +296,13 @@ private: */ Config::instance(); +#ifdef DCPOMATIC_LINUX + StatusDialog* d = new StatusDialog (); + d->Show (); +#else _icon = new TaskBarIcon; - _thread = new thread (bind (&App::main_thread, this)); +#endif + _thread = thread (bind (&App::main_thread, this)); Bind (wxEVT_TIMER, boost::bind (&App::check, this)); _timer.reset (new wxTimer (this)); @@ -304,6 +312,8 @@ private: splash->Destroy (); } + SetExitOnFrameDelete (false); + return true; } @@ -349,7 +359,7 @@ private: message_dialog (0, std_to_wx (m)); } - boost::thread* _thread; + boost::thread _thread; TaskBarIcon* _icon; shared_ptr _timer; };