Various bits related to subtitle font handling, particularly copying fonts to the...

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

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index a82478dfdbd47fc3a9e27985bff669eddd8c678f..8107949f5a9a4950e5661c728bc57eec15c74970 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -47,6 +47,14 @@ public:
                return _log;
        }
 
+       string head_and_tail (int amount = 1024) const {
+               if (int (_log.size ()) < (2 * amount)) {
+                       return _log;
+               }
+
+               return _log.substr (0, amount) + _log.substr (_log.size() - amount - 1, amount);
+       }
+
 private:
        void do_log (string m)
        {
@@ -100,7 +108,7 @@ public:
 #endif
 #ifdef __WXGTK__
                wxInitAllImageHandlers();
-               wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), POSIX_ICON_PREFIX), wxBITMAP_TYPE_PNG);
+               wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG);
                wxIcon icon;
                icon.CopyFromBitmap (bitmap);
 #endif