std::shared_ptr

[dcpomatic.git] / src / tools / dcpomatic_server.cc

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 3c2cd58dac2592e7f1d46c5eaa1a28a5e8e8fd9e..c59fefe8f3170e7a006f47a1cc4c463187417745 100644 (file)
--- 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 <wx/taskbar.h>
 #include <wx/splash.h>
 #include <wx/icon.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <boost/foreach.hpp>
 #include <boost/optional.hpp>
@@ -43,11 +46,14 @@ 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,
@@ -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);
@@ -198,7 +206,7 @@ private:
 
        wxTextCtrl* _text;
        wxStaticText* _fps;
-       boost::shared_ptr<wxTimer> _timer;
+       std::shared_ptr<wxTimer> _timer;
 };
 
 class TaskBarIcon : public wxTaskBarIcon
@@ -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<wxTimer> _timer;
 };