/*
- 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.
#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"
#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;
}
+UploadJob::~UploadJob ()
+{
+ stop_thread ();
+}
+
string
UploadJob::name () const
{
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;
}