X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=c23d1bd895cc839cc3c726e47c0fa17694b60492;hb=73654117144c6de0ec4efe39ddc88485df546cc9;hp=8cc86e0b0df8d667f3c292838617f222522f9010;hpb=3e6d2bdc8b5d75c63f5c5cc118148a59a5b245d3;p=dcpomatic.git diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 8cc86e0b0..c23d1bd89 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -24,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 @@ -190,9 +190,7 @@ private: void update_state () { - SafeStringStream 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; @@ -215,7 +213,7 @@ public: icon.CopyFromBitmap (bitmap); #endif - SetIcon (icon, std_to_wx ("DCP-o-matic encode server")); + 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);