X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fjob.h;h=5562afc16cc89cae1e9dec8941ee837622598d8b;hp=b44fd1365ee503c6479f6148907145d473d656ff;hb=a6c4b4fa16d9c6597e362044b875f3d6df80753f;hpb=5723d8d8518ad1cc0fef8bcc34a47671ab959fb3 diff --git a/src/lib/job.h b/src/lib/job.h index b44fd1365..5562afc16 100644 --- a/src/lib/job.h +++ b/src/lib/job.h @@ -50,6 +50,10 @@ public: virtual std::string json_name () const = 0; /** Run this job in the current thread. */ virtual void run () = 0; + /** @return true if it should be possible to notify when this job finishes */ + virtual bool enable_notify () const { + return false; + } void start (); bool pause_by_user (); @@ -87,13 +91,19 @@ public: return _film; } - void when_finished (boost::signals2::connection& connection, std::function finished); + enum class Result { + RESULT_OK, + RESULT_ERROR, // we can't have plain ERROR on Windows + RESULT_CANCELLED + }; + + void when_finished(boost::signals2::connection& connection, std::function finished); boost::signals2::signal Progress; /** Emitted from the UI thread when the job is finished */ - boost::signals2::signal Finished; + boost::signals2::signal Finished; /** Emitted from the job thread when the job is finished */ - boost::signals2::signal FinishedImmediate; + boost::signals2::signal FinishedImmediate; protected: @@ -110,8 +120,9 @@ protected: FINISHED_CANCELLED ///< the job was cancelled }; + Result state_to_result(State state) const; void set_state (State); - void set_error (std::string s, std::string d); + void set_error (std::string s, std::string d = ""); void set_message (std::string m); int elapsed_sub_time () const; void check_for_interruption_or_pause ();