Re-work scaling following excellent insights by Carsten Kurz, described

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

diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index cbcb8dfc622ce3261175fafec32df5311116ae5e..fbfbb92d83459bc1c89189cf3016a5880ad1c273 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.
 
@@ -46,6 +46,11 @@ UploadJob::UploadJob (shared_ptr<const Film> film)
 
 }
 
+UploadJob::~UploadJob ()
+{
+       stop_thread ();
+}
+
 string
 UploadJob::name () const
 {
@@ -65,10 +70,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;
        }