X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.h;h=560b5ca66c15d8ca9cf8c4840592a1a404bc8cff;hb=d2728b07a42b0da60effd259b508761e670c0789;hp=0c92efd2831f5d1b213d1a9e19ae2a0e4fdb9f1b;hpb=1c0f437ea1cbd6231ef9395b1f07c982cd408c39;p=dcpomatic.git diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h index 0c92efd28..560b5ca66 100644 --- a/src/lib/job_manager.h +++ b/src/lib/job_manager.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,17 +21,22 @@ * @brief A simple scheduler for jobs. */ -#include +#include "signaller.h" #include #include #include +#include class Job; +class Film; +class Playlist; + +extern void wait_for_jobs (); /** @class JobManager * @brief A simple scheduler for jobs. */ -class JobManager : public boost::noncopyable +class JobManager : public Signaller, public boost::noncopyable { public: @@ -40,8 +45,15 @@ public: bool work_to_do () const; bool errors () const; + void analyse_audio ( + boost::shared_ptr film, + boost::shared_ptr playlist, + boost::signals2::connection& connection, + boost::function ready + ); + boost::signals2::signal)> JobAdded; - boost::signals2::signal ActiveJobsChanged; + boost::signals2::signal, boost::optional)> ActiveJobsChanged; static JobManager* instance (); static void drop (); @@ -49,16 +61,17 @@ public: private: /* This function is part of the test suite */ friend void ::wait_for_jobs (); - + JobManager (); ~JobManager (); void scheduler (); - + void start (); + mutable boost::mutex _mutex; std::list > _jobs; bool _terminate; - bool _last_active_jobs; + boost::optional _last_active_job; boost::thread* _scheduler; static JobManager* _instance;