Distinguish master DoM encode threads count from the server count.

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

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 08a04f35cda0e753b240c40dd87630ae0beda87a..8e9ce7537cc3ff5ef50c65e0435de4a6d77670fa 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -25,7 +25,6 @@
 #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 <wx/taskbar.h>
@@ -191,9 +190,7 @@ private:
 
        void update_state ()
        {
-               locked_stringstream 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;
@@ -208,18 +205,18 @@ public:
                : _status (0)
        {
 #ifdef DCPOMATIC_WINDOWS
-               wxIcon icon (std_to_wx ("taskbar_icon"));
+               wxIcon icon (std_to_wx ("id"));
 #else
                wxInitAllImageHandlers();
-               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2.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"));
 
-               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 ()
@@ -292,7 +289,7 @@ private:
 
        void main_thread ()
        try {
-               EncodeServer server (server_log, false, Config::instance()->num_local_encoding_threads());
+               EncodeServer server (server_log, false, Config::instance()->server_encoding_threads());
                server.run ();
        } catch (...) {
                store_current ();