AnalyseAudioJob does not need an explicit playlist.

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

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index bcd5c8df6481254223d8c489c5759c255aec13d7..8107949f5a9a4950e5661c728bc57eec15c74970 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -47,12 +47,12 @@ public:
                return _log;
        }
 
-       string head_and_tail () const {
-               if (_log.size () < 2048) {
+       string head_and_tail (int amount = 1024) const {
+               if (int (_log.size ()) < (2 * amount)) {
                        return _log;
                }
 
-               return _log.substr (0, 1024) + _log.substr (_log.size() - 1025, 1024);
+               return _log.substr (0, amount) + _log.substr (_log.size() - amount - 1, amount);
        }
 
 private:
@@ -108,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