Remove some left-over JSON bits.

12 files changed, 0 insertions, 60 deletions

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index bfe0ed61f..8186f9de4 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -48,12 +48,6 @@ AnalyseAudioJob::name () const
 	return _("Analyse audio");
 }
 
-string
-AnalyseAudioJob::json_name () const
-{
-	return N_("analyse_audio");
-}
-
 void
 AnalyseAudioJob::run ()
 {
diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index 3e376634c..3d4881983 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -30,7 +30,6 @@ public:
 	AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<AudioContent>);
 
 	std::string name () const;
-	std::string json_name () const;
 	void run ();
 
 private:
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 8f16e2e5c..cbf180ffc 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -46,12 +46,6 @@ ExamineContentJob::name () const
 	return _("Examine content");
 }
 
-string
-ExamineContentJob::json_name () const
-{
-	return N_("examine_content");
-}
-
 void
 ExamineContentJob::run ()
 {
diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h
index c8037224f..b6903b86b 100644
--- a/src/lib/examine_content_job.h
+++ b/src/lib/examine_content_job.h
@@ -30,7 +30,6 @@ public:
 	~ExamineContentJob ();
 
 	std::string name () const;
-	std::string json_name () const;
 	void run ();
 
 private:
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 96aedac65..530ad9798 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -325,29 +325,6 @@ Job::status () const
 	return s.str ();
 }
 
-string
-Job::json_status () const
-{
-	boost::mutex::scoped_lock lm (_state_mutex);
-
-	switch (_state) {
-	case NEW:
-		return N_("new");
-	case RUNNING:
-		return N_("running");
-	case PAUSED:
-		return N_("paused");
-	case FINISHED_OK:
-		return N_("finished_ok");
-	case FINISHED_ERROR:
-		return N_("finished_error");
-	case FINISHED_CANCELLED:
-		return N_("finished_cancelled");
-	}
-
-	return "";
-}
-
 /** @return An estimate of the remaining time for this sub-job, in seconds */
 int
 Job::remaining_time () const
diff --git a/src/lib/job.h b/src/lib/job.h
index 5e3127dc1..97e3fc296 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -43,7 +43,6 @@ public:
 
 	/** @return user-readable name of this job */
 	virtual std::string name () const = 0;
-	virtual std::string json_name () const = 0;
 	/** Run this job in the current thread. */
 	virtual void run () = 0;
 	
@@ -65,7 +64,6 @@ public:
 
 	int elapsed_time () const;
 	virtual std::string status () const;
-	std::string json_status () const;
 	std::string sub_name () const {
 		return _sub_name;
 	}
diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc
index 5aade6382..67a1fb802 100644
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/scp_dcp_job.cc
@@ -111,12 +111,6 @@ SCPDCPJob::name () const
 	return _("Copy DCP to TMS");
 }
 
-string
-SCPDCPJob::json_name () const
-{
-	return N_("scp_dcp");
-}
-
 void
 SCPDCPJob::run ()
 {
diff --git a/src/lib/scp_dcp_job.h b/src/lib/scp_dcp_job.h
index e3960d73b..bdc83af18 100644
--- a/src/lib/scp_dcp_job.h
+++ b/src/lib/scp_dcp_job.h
@@ -29,7 +29,6 @@ public:
 	SCPDCPJob (boost::shared_ptr<const Film>);
 
 	std::string name () const;
-	std::string json_name () const;
 	void run ();
 	std::string status () const;
 
diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 1dec2ffb0..164dfe987 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -52,12 +52,6 @@ SendKDMEmailJob::name () const
 	return String::compose (_("Email KDMs for %1"), _film->name());
 }
 
-string
-SendKDMEmailJob::json_name () const
-{
-	return N_("send_kdm_email");
-}
-
 void
 SendKDMEmailJob::run ()
 {
diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h
index 8a8903040..778d3927a 100644
--- a/src/lib/send_kdm_email_job.h
+++ b/src/lib/send_kdm_email_job.h
@@ -36,7 +36,6 @@ public:
 		);
 
 	std::string name () const;
-	std::string json_name () const;
 	void run ();
 
 private:
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index ef15f9f5e..675a95116 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -53,12 +53,6 @@ TranscodeJob::name () const
 	return String::compose (_("Transcode %1"), _film->name());
 }
 
-string
-TranscodeJob::json_name () const
-{
-	return N_("transcode");
-}
-
 void
 TranscodeJob::run ()
 {
diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index 6e3c1ead9..9128206d2 100644
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -35,7 +35,6 @@ public:
 	TranscodeJob (boost::shared_ptr<const Film> f);
 	
 	std::string name () const;
-	std::string json_name () const;
 	void run ();
 	std::string status () const;