From 94ab538738526948c5a52ed1222be1e484255541 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Nov 2021 10:39:03 +0100 Subject: Rearrange checking (and re-examining) content. Most importantly, checking of content for changes before making a DCP is now done in the TranscodeJob (rather than being in a separate job). This makes things a little neater and also makes the batch converter less confusing when you add a job whose content has changed. --- src/lib/transcode_job.h | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'src/lib/transcode_job.h') diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h index 030e22bef..368a9b685 100644 --- a/src/lib/transcode_job.h +++ b/src/lib/transcode_job.h @@ -19,6 +19,10 @@ */ +#ifndef DCPOMATIC_TRANSCODE_JOB_H +#define DCPOMATIC_TRANSCODE_JOB_H + + /** @file src/transcode_job.h * @brief A job which transcodes from one format to another. */ @@ -27,6 +31,10 @@ #include "job.h" +/* Defined by Windows */ +#undef IGNORE + + class Encoder; @@ -36,7 +44,13 @@ class Encoder; class TranscodeJob : public Job { public: - explicit TranscodeJob (std::shared_ptr film); + enum class ChangedBehaviour { + EXAMINE_THEN_STOP, + STOP, + IGNORE + }; + + explicit TranscodeJob (std::shared_ptr film, ChangedBehaviour changed); ~TranscodeJob (); std::string name () const override; @@ -50,4 +64,9 @@ private: int remaining_time () const override; std::shared_ptr _encoder; + ChangedBehaviour _changed; }; + + +#endif + -- cgit v1.2.3