s/destroy_thread/stop_thread/

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 611a57f5b49a205e6c77736e3339784baaf363b5..d52b4051534cc3937d9d42e24880573812d9b03b 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -82,7 +82,7 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const
 
 AnalyseAudioJob::~AnalyseAudioJob ()
 {
-       destroy_thread ();
+       stop_thread ();
        BOOST_FOREACH (Filter const * i, _filters) {
                delete const_cast<Filter*> (i);
        }

diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc
index fbeb695df1304256e0b7d60c5db4c1c8c2bf7bb1..f2246270d407add159407b723c898746bbddf91c 100644 (file)
--- a/src/lib/check_content_change_job.cc
+++ b/src/lib/check_content_change_job.cc
@@ -43,7 +43,7 @@ CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film, share
 
 CheckContentChangeJob::~CheckContentChangeJob()
 {
-       destroy_thread ();
+       stop_thread ();
 }
 
 string

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 5c854a99b49b33e44ad1058121542b4fc5051a9a..3be38863d46e4204bf364da3989ee4b1d7e0fe19 100644 (file)
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -40,7 +40,7 @@ ExamineContentJob::ExamineContentJob (shared_ptr<const Film> film, shared_ptr<Co
 
 ExamineContentJob::~ExamineContentJob ()
 {
-       destroy_thread ();
+       stop_thread ();
 }
 
 string

diff --git a/src/lib/examine_ffmpeg_subtitles_job.cc b/src/lib/examine_ffmpeg_subtitles_job.cc
index eb2cbcd1f1da2b0866c99085e08e1cc463c48633..b2bba11cd05707acf1c32647e48dc2754bcd3d2a 100644 (file)
--- a/src/lib/examine_ffmpeg_subtitles_job.cc
+++ b/src/lib/examine_ffmpeg_subtitles_job.cc
@@ -45,7 +45,7 @@ ExamineFFmpegSubtitlesJob::ExamineFFmpegSubtitlesJob (shared_ptr<const Film> fil
 
 ExamineFFmpegSubtitlesJob::~ExamineFFmpegSubtitlesJob ()
 {
-       destroy_thread ();
+       stop_thread ();
 }
 
 string

diff --git a/src/lib/job.cc b/src/lib/job.cc
index d4023973cfb4fd9942032f99f793d4dee04e7627..95f09a4dc3fdf70eb9f1d3ad486c1026914ad77a 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -63,13 +63,13 @@ Job::Job (shared_ptr<const Film> film)
 Job::~Job ()
 {
 #ifdef DCPOMATIC_DEBUG
-       /* Any subclass should have called destroy_thread in its destructor */
+       /* Any subclass should have called stop_thread in its destructor */
        assert (!_thread);
 #endif
 }
 
 void
-Job::destroy_thread ()
+Job::stop_thread ()
 {
        if (_thread) {
                _thread->interrupt ();

diff --git a/src/lib/job.h b/src/lib/job.h
index 7047a7ba3540f3368d020824d31bb36ab77502b2..cb85059a61875c470a5a750d225fe51930dd7ee2 100644 (file)
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -112,7 +112,7 @@ protected:
        void set_message (std::string m);
        int elapsed_sub_time () const;
        void check_for_interruption_or_pause ();
-       void destroy_thread ();
+       void stop_thread ();
 
        boost::shared_ptr<const Film> _film;
 

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index a4b4b297f453287d81ae377c859a5aa99a28df6e..1b476fa63e7312a1ea67710a45e2fc0a6c88b384 100644 (file)
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -55,7 +55,7 @@ SendKDMEmailJob::SendKDMEmailJob (
 
 SendKDMEmailJob::~SendKDMEmailJob ()
 {
-       destroy_thread ();
+       stop_thread ();
 }
 
 string

diff --git a/src/lib/send_notification_email_job.cc b/src/lib/send_notification_email_job.cc
index 5986e5a166de74e34c07141d2c8747097e2d9b90..1c9d963388a1eefd1451984481f4b05f1df5484b 100644 (file)
--- a/src/lib/send_notification_email_job.cc
+++ b/src/lib/send_notification_email_job.cc
@@ -42,7 +42,7 @@ SendNotificationEmailJob::SendNotificationEmailJob (string body)
 
 SendNotificationEmailJob::~SendNotificationEmailJob ()
 {
-       destroy_thread ();
+       stop_thread ();
 }
 
 string

diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc
index 83092049f19be55746613a406ecea05f6f54a45f..d27609f0bdd715aac50fff167e7dbbaf40b2c042 100644 (file)
--- a/src/lib/send_problem_report_job.cc
+++ b/src/lib/send_problem_report_job.cc
@@ -54,7 +54,7 @@ SendProblemReportJob::SendProblemReportJob (
 
 SendProblemReportJob::~SendProblemReportJob ()
 {
-       destroy_thread ();
+       stop_thread ();
 }
 
 string

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index f2711bf1760e86e4fc837fff27d91ec2b2822290..c13f69d70f15d51789b1ca49a017ce3dae838bf4 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -53,7 +53,7 @@ TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
 
 TranscodeJob::~TranscodeJob ()
 {
-       destroy_thread ();
+       stop_thread ();
 }
 
 string

diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index eca46838dd7eadd1e0af83e1e238ce07648ae716..fbfbb92d83459bc1c89189cf3016a5880ad1c273 100644 (file)
--- a/src/lib/upload_job.cc
+++ b/src/lib/upload_job.cc
@@ -48,7 +48,7 @@ UploadJob::UploadJob (shared_ptr<const Film> film)
 
 UploadJob::~UploadJob ()
 {
-       destroy_thread ();
+       stop_thread ();
 }
 
 string

diff --git a/src/lib/verify_dcp_job.cc b/src/lib/verify_dcp_job.cc
index 03d9c4c4cbfab3f608eab324f562e65e541297f0..35d3225f1d0133dc05be6057e6d5aa7653768167 100644 (file)
--- a/src/lib/verify_dcp_job.cc
+++ b/src/lib/verify_dcp_job.cc
@@ -37,7 +37,7 @@ VerifyDCPJob::VerifyDCPJob (vector<boost::filesystem::path> directories)
 
 VerifyDCPJob::~VerifyDCPJob ()
 {
-       destroy_thread ();
+       stop_thread ();
 }
 
 string