summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-03-06 21:10:00 +0000
committerCarl Hetherington <cth@carlh.net>2020-03-06 21:10:06 +0000
commit723f71ae3d3568d4746d4db13df906e0e2c9fb2a (patch)
treeed982228019631d74cd2ff0c8e05b5c9d60773d9
parente03d6f9bc6af9dfa8602c82cc52040a92144deaf (diff)
s/destroy_thread/stop_thread/
-rw-r--r--src/lib/analyse_audio_job.cc2
-rw-r--r--src/lib/check_content_change_job.cc2
-rw-r--r--src/lib/examine_content_job.cc2
-rw-r--r--src/lib/examine_ffmpeg_subtitles_job.cc2
-rw-r--r--src/lib/job.cc4
-rw-r--r--src/lib/job.h2
-rw-r--r--src/lib/send_kdm_email_job.cc2
-rw-r--r--src/lib/send_notification_email_job.cc2
-rw-r--r--src/lib/send_problem_report_job.cc2
-rw-r--r--src/lib/transcode_job.cc2
-rw-r--r--src/lib/upload_job.cc2
-rw-r--r--src/lib/verify_dcp_job.cc2
12 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 611a57f5b..d52b40515 100644
--- 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 fbeb695df..f2246270d 100644
--- 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 5c854a99b..3be38863d 100644
--- 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 eb2cbcd1f..b2bba11cd 100644
--- 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 d4023973c..95f09a4dc 100644
--- 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 7047a7ba3..cb85059a6 100644
--- 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 a4b4b297f..1b476fa63 100644
--- 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 5986e5a16..1c9d96338 100644
--- 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 83092049f..d27609f0b 100644
--- 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 f2711bf17..c13f69d70 100644
--- 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 eca46838d..fbfbb92d8 100644
--- 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 03d9c4c4c..35d3225f1 100644
--- 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