From: Carl Hetherington Date: Thu, 9 Jun 2022 19:24:46 +0000 (+0200) Subject: Rename CheckContentChangeJob -> CheckContentJob. X-Git-Tag: v2.16.14~10 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=3d9c0674236a425f0be5e9caff5e23f59e7c037a Rename CheckContentChangeJob -> CheckContentJob. --- diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc deleted file mode 100644 index 16ef8d864..000000000 --- a/src/lib/check_content_change_job.cc +++ /dev/null @@ -1,79 +0,0 @@ -/* - Copyright (C) 2018 Carl Hetherington - - 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 . - -*/ - - -#include "check_content_change_job.h" -#include "content.h" -#include "examine_content_job.h" -#include "film.h" -#include "job_manager.h" -#include - -#include "i18n.h" - - -using std::cout; -using std::make_shared; -using std::shared_ptr; -using std::string; - - -CheckContentChangeJob::CheckContentChangeJob (shared_ptr 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> changed; - std::copy_if (content.begin(), content.end(), std::back_inserter(changed), [](shared_ptr c) { return c->changed(); }); - - if (!changed.empty()) { - for (auto i: changed) { - JobManager::instance()->add(make_shared(_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 index a374e2a6f..000000000 --- a/src/lib/check_content_change_job.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Copyright (C) 2018 Carl Hetherington - - 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 . - -*/ - -#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); - ~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 index 000000000..a789ed9e0 --- /dev/null +++ b/src/lib/check_content_job.cc @@ -0,0 +1,79 @@ +/* + Copyright (C) 2018 Carl Hetherington + + 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 . + +*/ + + +#include "check_content_job.h" +#include "content.h" +#include "examine_content_job.h" +#include "film.h" +#include "job_manager.h" +#include + +#include "i18n.h" + + +using std::cout; +using std::make_shared; +using std::shared_ptr; +using std::string; + + +CheckContentJob::CheckContentJob (shared_ptr 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> changed; + std::copy_if (content.begin(), content.end(), std::back_inserter(changed), [](shared_ptr c) { return c->changed(); }); + + if (!changed.empty()) { + for (auto i: changed) { + JobManager::instance()->add(make_shared(_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 index 000000000..3a8e8d653 --- /dev/null +++ b/src/lib/check_content_job.h @@ -0,0 +1,36 @@ +/* + Copyright (C) 2018 Carl Hetherington + + 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 . + +*/ + +#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); + ~CheckContentJob (); + + std::string name () const override; + std::string json_name () const override; + void run () 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(film)); + JobManager::instance()->add(make_shared(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