Rename SCPDCPJob -> UploadJob.

4 files changed, 19 insertions, 19 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index e19b309f7..27ff07537 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -27,7 +27,7 @@
 #include "util.h"
 #include "job_manager.h"
 #include "transcode_job.h"
-#include "scp_dcp_job.h"
+#include "upload_job.h"
 #include "log.h"
 #include "exceptions.h"
 #include "examine_content_job.h"
@@ -302,7 +302,7 @@ Film::make_dcp ()
 void
 Film::send_dcp_to_tms ()
 {
-	shared_ptr<Job> j (new SCPDCPJob (shared_from_this()));
+	shared_ptr<Job> j (new UploadJob (shared_from_this()));
 	JobManager::instance()->add (j);
 }
 
diff --git a/src/lib/scp_dcp_job.cc b/src/lib/upload_job.cc
index 86eec16b2..5a0c73797 100644
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/upload_job.cc
@@ -17,8 +17,8 @@
 
 */
 
-/** @file src/scp_dcp_job.cc
- *  @brief A job to copy DCPs to a SCP-enabled server.
+/** @file src/upload_job.cc
+ *  @brief A job to copy DCPs to a server using libcurl.
  */
 
 #include <iostream>
@@ -28,7 +28,7 @@
 #include <boost/filesystem.hpp>
 #include <libssh/libssh.h>
 #include "compose.hpp"
-#include "scp_dcp_job.h"
+#include "upload_job.h"
 #include "exceptions.h"
 #include "config.h"
 #include "log.h"
@@ -98,7 +98,7 @@ public:
 };
 
 
-SCPDCPJob::SCPDCPJob (shared_ptr<const Film> film)
+UploadJob::UploadJob (shared_ptr<const Film> film)
 	: Job (film)
 	, _status (_("Waiting"))
 {
@@ -106,21 +106,21 @@ SCPDCPJob::SCPDCPJob (shared_ptr<const Film> film)
 }
 
 string
-SCPDCPJob::name () const
+UploadJob::name () const
 {
 	return _("Copy DCP to TMS");
 }
 
 string
-SCPDCPJob::json_name () const
+UploadJob::json_name () const
 {
-	return N_("scp_dcp");
+	return N_("upload");
 }
 
 void
-SCPDCPJob::run ()
+UploadJob::run ()
 {
-	LOG_GENERAL_NC (N_("SCP DCP job starting"));
+	LOG_GENERAL_NC (N_("Upload job starting"));
 
 	SSHSession ss;
 
@@ -213,7 +213,7 @@ SCPDCPJob::run ()
 }
 
 string
-SCPDCPJob::status () const
+UploadJob::status () const
 {
 	boost::mutex::scoped_lock lm (_status_mutex);
 	string s = Job::status ();
@@ -224,7 +224,7 @@ SCPDCPJob::status () const
 }
 
 void
-SCPDCPJob::set_status (string s)
+UploadJob::set_status (string s)
 {
 	boost::mutex::scoped_lock lm (_status_mutex);
 	_status = s;
diff --git a/src/lib/scp_dcp_job.h b/src/lib/upload_job.h
index e3960d73b..3612eaaee 100644
--- a/src/lib/scp_dcp_job.h
+++ b/src/lib/upload_job.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,16 +17,16 @@
 
 */
 
-/** @file src/scp_dcp_job.h
- *  @brief A job to copy DCPs to a SCP-enabled server.
+/** @file src/upload_job.h
+ *  @brief A job to copy DCPs to a server using libcurl.
  */
 
 #include "job.h"
 
-class SCPDCPJob : public Job
+class UploadJob : public Job
 {
 public:
-	SCPDCPJob (boost::shared_ptr<const Film>);
+	UploadJob (boost::shared_ptr<const Film>);
 
 	std::string name () const;
 	std::string json_name () const;
diff --git a/src/lib/wscript b/src/lib/wscript
index 5a9c2b7fc..486f0557f 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -92,7 +92,6 @@ sources = """
           render_subtitles.cc
           resampler.cc
           safe_stringstream.cc
-          scp_dcp_job.cc
           scoped_temporary.cc
           send_kdm_email_job.cc
           send_problem_report_job.cc
@@ -114,6 +113,7 @@ sources = """
           types.cc
           signal_manager.cc
           update.cc
+          upload_job.cc
           upmixer_a.cc
           util.cc
           video_content.cc