Fix incorrect timing of PNG subtitles in second and subsequent reels.

[dcpomatic.git] / src / lib / upload_job.cc

diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index 4726c734ab19db889ea97e8f3bcda684db3d1b71..b229fddbe217f8d5926a4e94633c33103753dee0 100644 (file)
--- a/src/lib/upload_job.cc
+++ b/src/lib/upload_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -26,6 +26,7 @@
 #include "upload_job.h"
 #include "config.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "film.h"
 #include "scp_uploader.h"
 #include "curl_uploader.h"
@@ -33,8 +34,6 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-
 using std::string;
 using std::min;
 using boost::shared_ptr;
@@ -66,10 +65,10 @@ UploadJob::run ()
 
        scoped_ptr<Uploader> uploader;
        switch (Config::instance()->tms_protocol ()) {
-       case PROTOCOL_SCP:
+       case FILE_TRANSFER_PROTOCOL_SCP:
                uploader.reset (new SCPUploader (bind (&UploadJob::set_status, this, _1), bind (&UploadJob::set_progress, this, _1, false)));
                break;
-       case PROTOCOL_FTP:
+       case FILE_TRANSFER_PROTOCOL_FTP:
                uploader.reset (new CurlUploader (bind (&UploadJob::set_status, this, _1), bind (&UploadJob::set_progress, this, _1, false)));
                break;
        }