projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s/destroy_thread/stop_thread/
[dcpomatic.git]
/
src
/
lib
/
upload_job.cc
diff --git
a/src/lib/upload_job.cc
b/src/lib/upload_job.cc
index 90ebafd52160ab3c2f8e8d5cccc239779404de92..fbfbb92d83459bc1c89189cf3016a5880ad1c273 100644
(file)
--- a/
src/lib/upload_job.cc
+++ b/
src/lib/upload_job.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
9
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-25,6
+26,7
@@
#include "upload_job.h"
#include "config.h"
#include "log.h"
#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 "film.h"
#include "scp_uploader.h"
#include "curl_uploader.h"
@@
-32,8
+34,6
@@
#include "i18n.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;
using std::string;
using std::min;
using boost::shared_ptr;
@@
-46,6
+46,11
@@
UploadJob::UploadJob (shared_ptr<const Film> film)
}
}
+UploadJob::~UploadJob ()
+{
+ stop_thread ();
+}
+
string
UploadJob::name () const
{
string
UploadJob::name () const
{
@@
-65,10
+70,10
@@
UploadJob::run ()
scoped_ptr<Uploader> uploader;
switch (Config::instance()->tms_protocol ()) {
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;
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;
}
uploader.reset (new CurlUploader (bind (&UploadJob::set_status, this, _1), bind (&UploadJob::set_progress, this, _1, false)));
break;
}