Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

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

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index bbdd191356ff712dd16e7ae387827e477c7eb6d8..08a04f35cda0e753b240c40dd87630ae0beda87a 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -137,7 +138,7 @@ class StatusDialog : public wxDialog
 public:
        StatusDialog ()
                : wxDialog (
-                       0, wxID_ANY, _("DCP-o-matic encode server"),
+                       0, wxID_ANY, _("DCP-o-matic Encode Server"),
                        wxDefaultPosition, wxDefaultSize,
                        wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
                        )
@@ -190,7 +191,7 @@ private:
 
        void update_state ()
        {
-               SafeStringStream s;
+               locked_stringstream s;
                s << fixed << setprecision(1) << server_log->fps ();
                _fps->SetLabel (std_to_wx (s.str()));
        }
@@ -215,7 +216,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);