C++11 tidying.

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

diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index cbcb8dfc622ce3261175fafec32df5311116ae5e..ec474abdfd49879517b92243ded556fbea60fa84 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.
 
@@ -36,8 +36,11 @@
 
 using std::string;
 using std::min;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::scoped_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 UploadJob::UploadJob (shared_ptr<const Film> film)
        : Job (film)
@@ -46,6 +49,11 @@ UploadJob::UploadJob (shared_ptr<const Film> film)
 
 }
 
+UploadJob::~UploadJob ()
+{
+       stop_thread ();
+}
+
 string
 UploadJob::name () const
 {
@@ -64,16 +72,16 @@ UploadJob::run ()
        LOG_GENERAL_NC (N_("Upload job starting"));
 
        scoped_ptr<Uploader> uploader;
-       switch (Config::instance()->tms_protocol ()) {
-       case PROTOCOL_SCP:
-               uploader.reset (new SCPUploader (bind (&UploadJob::set_status, this, _1), bind (&UploadJob::set_progress, this, _1, false)));
+       switch (Config::instance()->tms_protocol()) {
+       case FileTransferProtocol::SCP:
+               uploader.reset (new SCPUploader(bind (&UploadJob::set_status, this, _1), bind(&UploadJob::set_progress, this, _1, false)));
                break;
-       case PROTOCOL_FTP:
-               uploader.reset (new CurlUploader (bind (&UploadJob::set_status, this, _1), bind (&UploadJob::set_progress, this, _1, false)));
+       case FileTransferProtocol::FTP:
+               uploader.reset (new CurlUploader(bind (&UploadJob::set_status, this, _1), bind(&UploadJob::set_progress, this, _1, false)));
                break;
        }
 
-       uploader->upload (_film->dir (_film->dcp_name ()));
+       uploader->upload (_film->dir(_film->dcp_name()));
 
        set_progress (1);
        set_status (N_(""));