Rename CheckContentChangeJob -> CheckContentJob.
authorCarl Hetherington <cth@carlh.net>
Thu, 9 Jun 2022 19:24:46 +0000 (21:24 +0200)
committerCarl Hetherington <cth@carlh.net>
Fri, 10 Jun 2022 21:12:13 +0000 (23:12 +0200)
src/lib/check_content_change_job.cc [deleted file]
src/lib/check_content_change_job.h [deleted file]
src/lib/check_content_job.cc [new file with mode: 0644]
src/lib/check_content_job.h [new file with mode: 0644]
src/lib/film.cc
src/lib/wscript
src/tools/dcpomatic.cc
test/wscript

diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc
deleted file mode 100644 (file)
index 16ef8d8..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
-
-    This file is part of DCP-o-matic.
-
-    DCP-o-matic is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    DCP-o-matic is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-
-#include "check_content_change_job.h"
-#include "content.h"
-#include "examine_content_job.h"
-#include "film.h"
-#include "job_manager.h"
-#include <iostream>
-
-#include "i18n.h"
-
-
-using std::cout;
-using std::make_shared;
-using std::shared_ptr;
-using std::string;
-
-
-CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film)
-       : Job (film)
-{
-
-}
-
-CheckContentChangeJob::~CheckContentChangeJob ()
-{
-       stop_thread ();
-}
-
-string
-CheckContentChangeJob::name () const
-{
-       return _("Checking content for changes");
-}
-
-string
-CheckContentChangeJob::json_name () const
-{
-       return N_("check_content_change");
-}
-
-void
-CheckContentChangeJob::run ()
-{
-       set_progress_unknown ();
-
-       auto content = _film->content();
-       std::vector<shared_ptr<Content>> changed;
-       std::copy_if (content.begin(), content.end(), std::back_inserter(changed), [](shared_ptr<Content> c) { return c->changed(); });
-
-       if (!changed.empty()) {
-               for (auto i: changed) {
-                       JobManager::instance()->add(make_shared<ExamineContentJob>(_film, i));
-               }
-               set_message (_("Some files have been changed since they were added to the project.\n\nThese files will now be re-examined, so you may need to check their settings."));
-       }
-
-       set_progress (1);
-       set_state (FINISHED_OK);
-}
diff --git a/src/lib/check_content_change_job.h b/src/lib/check_content_change_job.h
deleted file mode 100644 (file)
index a374e2a..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
-
-    This file is part of DCP-o-matic.
-
-    DCP-o-matic is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    DCP-o-matic is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "job.h"
-
-/** @class CheckContentChangeJob
- *  @brief A job to check whether content has changed since it was added to the film.
- */
-
-class CheckContentChangeJob : public Job
-{
-public:
-       CheckContentChangeJob (std::shared_ptr<const Film>);
-       ~CheckContentChangeJob ();
-
-       std::string name () const override;
-       std::string json_name () const override;
-       void run () override;
-};
diff --git a/src/lib/check_content_job.cc b/src/lib/check_content_job.cc
new file mode 100644 (file)
index 0000000..a789ed9
--- /dev/null
@@ -0,0 +1,79 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "check_content_job.h"
+#include "content.h"
+#include "examine_content_job.h"
+#include "film.h"
+#include "job_manager.h"
+#include <iostream>
+
+#include "i18n.h"
+
+
+using std::cout;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+
+
+CheckContentJob::CheckContentJob (shared_ptr<const Film> film)
+       : Job (film)
+{
+
+}
+
+CheckContentJob::~CheckContentJob ()
+{
+       stop_thread ();
+}
+
+string
+CheckContentJob::name () const
+{
+       return _("Checking content");
+}
+
+string
+CheckContentJob::json_name () const
+{
+       return N_("check_content");
+}
+
+void
+CheckContentJob::run ()
+{
+       set_progress_unknown ();
+
+       auto content = _film->content();
+       std::vector<shared_ptr<Content>> changed;
+       std::copy_if (content.begin(), content.end(), std::back_inserter(changed), [](shared_ptr<Content> c) { return c->changed(); });
+
+       if (!changed.empty()) {
+               for (auto i: changed) {
+                       JobManager::instance()->add(make_shared<ExamineContentJob>(_film, i));
+               }
+               set_message (_("Some files have been changed since they were added to the project.\n\nThese files will now be re-examined, so you may need to check their settings."));
+       }
+
+       set_progress (1);
+       set_state (FINISHED_OK);
+}
diff --git a/src/lib/check_content_job.h b/src/lib/check_content_job.h
new file mode 100644 (file)
index 0000000..3a8e8d6
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "job.h"
+
+/** @class CheckContentJob
+ *  @brief A job to check content that was just loaded to see if anything needs fixing about it.
+ */
+
+class CheckContentJob : public Job
+{
+public:
+       CheckContentJob (std::shared_ptr<const Film>);
+       ~CheckContentJob ();
+
+       std::string name () const override;
+       std::string json_name () const override;
+       void run () override;
+};
index 54267bc5686038d1006fd1c75ba62de41e641e3f..1aba68eeb653f8342e158bcc598f74ec751d2d52 100644 (file)
@@ -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"
index 6bab60d545d9ced24dcb7383df799b3b33ffa3fa..8d3bb8eb5df07b680e75fd740ef2322e843c609d 100644 (file)
@@ -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
index 65574cc67e349b121174264c1bf11154f2b35065..ebcd05a682770c20677d4ca1db22b893d3567303 100644 (file)
@@ -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();
index e05f85a582fcd6ef0499c03a5aaf065ba7f77eaa..b7dc1669fa41c066967ce31d350f562df18e3764 100644 (file)
@@ -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