Remove some left-over JSON bits.

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index bfe0ed61f281816a71e20b66f17c18e429d46ac9..8186f9de49b9d89baa81c04d7f454f876b8de963 100644 (file)
--- 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 3e376634cd0d9be375fc825ae60c6285db16588a..3d4881983b5234572ce40a47455c5b849a620328 100644 (file)
--- 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 8f16e2e5c0c069e2ab601c4bf91cec39c1e3cebc..cbf180ffcb3bf451379e410039d5d28dfed75d80 100644 (file)
--- 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 c8037224faa708737e6739d5c29bc544ee74ad0f..b6903b86bebf0ed9e80970a7382c0f07628301cc 100644 (file)
--- 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 96aedac65bf4fb8718d8749712db3ae28d9ae627..530ad979830495cbe9a43ecbb90c3bc6082457f7 100644 (file)
--- 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 5e3127dc158a432522590ffec566e5cfa1e21bbf..97e3fc29637d292597d943f4c9e70a77cdd8dfad 100644 (file)
--- 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 5aade6382d13b3442dee91ca94f98cb7fad05838..67a1fb8026a68325b768a86fa1808dd258345490 100644 (file)
--- 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 e3960d73b512dac54d25124be28740d15dfd67cf..bdc83af187f85a0091d31e107d554ee9dd07ef4c 100644 (file)
--- 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 1dec2ffb001dc7ce77fdfd4d1c595e8646bb90c9..164dfe9875e4ec35a5578e8ff41f9132fe7eea7c 100644 (file)
--- 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 8a8903040c06b573815fe2d3be9b999fa90c47b1..778d3927ac01d7a741c88804065dab4f5df00c21 100644 (file)
--- 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 ef15f9f5e9865968ecee6f6b87e0437e672d1e66..675a951160cd31f2027da12d6f2c3ac89d146c03 100644 (file)
--- 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 6e3c1ead9314cc5af7bb2877f208c38ae4358fa3..9128206d29dc9c9e42460cafecfa4748f0a1c0db 100644 (file)
--- 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;
 

diff --git a/test/job_test.cc b/test/job_test.cc
index a77bc949ce123e7e851ea23d038315039476b1a9..7d2911c4e756259f917a2fcf1e6f368c0fca67ce 100644 (file)
--- a/test/job_test.cc
+++ b/test/job_test.cc
@@ -54,10 +54,6 @@ public:
        string name () const {
                return "";
        }
-
-       string json_name () const {
-               return "";
-       }
 };
 
 BOOST_AUTO_TEST_CASE (job_manager_test)