From 3d9c0674236a425f0be5e9caff5e23f59e7c037a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 9 Jun 2022 21:24:46 +0200
Subject: [PATCH] Rename CheckContentChangeJob -> CheckContentJob.

---
 ...ontent_change_job.cc => check_content_job.cc} | 16 ++++++++--------
 ..._content_change_job.h => check_content_job.h} | 10 +++++-----
 src/lib/film.cc                                  |  1 -
 src/lib/wscript                                  |  2 +-
 src/tools/dcpomatic.cc                           |  4 ++--
 test/wscript                                     |  1 +
 6 files changed, 17 insertions(+), 17 deletions(-)
 rename src/lib/{check_content_change_job.cc => check_content_job.cc} (82%)
 rename src/lib/{check_content_change_job.h => check_content_job.h} (78%)

diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_job.cc
similarity index 82%
rename from src/lib/check_content_change_job.cc
rename to src/lib/check_content_job.cc
index 16ef8d864..a789ed9e0 100644
--- a/src/lib/check_content_change_job.cc
+++ b/src/lib/check_content_job.cc
@@ -19,7 +19,7 @@
 */
 
 
-#include "check_content_change_job.h"
+#include "check_content_job.h"
 #include "content.h"
 #include "examine_content_job.h"
 #include "film.h"
@@ -35,31 +35,31 @@ using std::shared_ptr;
 using std::string;
 
 
-CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film)
+CheckContentJob::CheckContentJob (shared_ptr<const Film> film)
 	: Job (film)
 {
 
 }
 
-CheckContentChangeJob::~CheckContentChangeJob ()
+CheckContentJob::~CheckContentJob ()
 {
 	stop_thread ();
 }
 
 string
-CheckContentChangeJob::name () const
+CheckContentJob::name () const
 {
-	return _("Checking content for changes");
+	return _("Checking content");
 }
 
 string
-CheckContentChangeJob::json_name () const
+CheckContentJob::json_name () const
 {
-	return N_("check_content_change");
+	return N_("check_content");
 }
 
 void
-CheckContentChangeJob::run ()
+CheckContentJob::run ()
 {
 	set_progress_unknown ();
 
diff --git a/src/lib/check_content_change_job.h b/src/lib/check_content_job.h
similarity index 78%
rename from src/lib/check_content_change_job.h
rename to src/lib/check_content_job.h
index a374e2a6f..3a8e8d653 100644
--- a/src/lib/check_content_change_job.h
+++ b/src/lib/check_content_job.h
@@ -20,15 +20,15 @@
 
 #include "job.h"
 
-/** @class CheckContentChangeJob
- *  @brief A job to check whether content has changed since it was added to the film.
+/** @class CheckContentJob
+ *  @brief A job to check content that was just loaded to see if anything needs fixing about it.
  */
 
-class CheckContentChangeJob : public Job
+class CheckContentJob : public Job
 {
 public:
-	CheckContentChangeJob (std::shared_ptr<const Film>);
-	~CheckContentChangeJob ();
+	CheckContentJob (std::shared_ptr<const Film>);
+	~CheckContentJob ();
 
 	std::string name () const override;
 	std::string json_name () const override;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 54267bc56..1aba68eeb 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -29,7 +29,6 @@
 #include "audio_content.h"
 #include "audio_processor.h"
 #include "change_signaller.h"
-#include "check_content_change_job.h"
 #include "cinema.h"
 #include "compose.hpp"
 #include "config.h"
diff --git a/src/lib/wscript b/src/lib/wscript
index 6bab60d54..8d3bb8eb5 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -48,7 +48,7 @@ sources = """
           text_content.cc
           text_decoder.cc
           case_insensitive_sorter.cc
-          check_content_change_job.cc
+          check_content_job.cc
           cinema.cc
           cinema_sound_processor.cc
           colour_conversion.cc
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 65574cc67..ebcd05a68 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -56,7 +56,7 @@
 #include "wx/wx_util.h"
 #include "lib/analytics.h"
 #include "lib/audio_content.h"
-#include "lib/check_content_change_job.h"
+#include "lib/check_content_job.h"
 #include "lib/cinema.h"
 #include "lib/compose.hpp"
 #include "lib/config.h"
@@ -458,7 +458,7 @@ public:
 
 		set_film (film);
 
-		JobManager::instance()->add(make_shared<CheckContentChangeJob>(film));
+		JobManager::instance()->add(make_shared<CheckContentJob>(film));
 	}
 	catch (FileNotFoundError& e) {
 		auto const dir = e.file().parent_path();
diff --git a/test/wscript b/test/wscript
index e05f85a58..b7dc1669f 100644
--- a/test/wscript
+++ b/test/wscript
@@ -135,6 +135,7 @@ def build(bld):
                  ssa_subtitle_test.cc
                  stream_test.cc
                  subtitle_charset_test.cc
+                 subtitle_font_id_change_test.cc
                  subtitle_language_test.cc
                  subtitle_metadata_test.cc
                  subtitle_reel_test.cc
-- 
2.30.2