X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.h;h=c6be2a78e754a053609513897ade1eceee1fa977;hb=02cc8c7680381c123a31c23a43f6b34a04c2115a;hp=b946c1a98e0836893eb758b2d19554d4643871e2;hpb=6f0a590bc3266f21ba577116219bd019e891d480;p=dcpomatic.git diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h index b946c1a98..c6be2a78e 100644 --- a/src/lib/job_manager.h +++ b/src/lib/job_manager.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + 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. - This program is distributed in the hope that it will be useful, + 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 this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -28,7 +29,10 @@ #include class Job; -extern void wait_for_jobs (); +class Film; +class Playlist; + +extern bool wait_for_jobs (); /** @class JobManager * @brief A simple scheduler for jobs. @@ -42,25 +46,33 @@ 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 (); private: /* This function is part of the test suite */ - friend void ::wait_for_jobs (); - + friend bool ::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;