projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow configuration of MXF/XML filenames (part of #710).
[dcpomatic.git]
/
src
/
lib
/
job_manager.h
diff --git
a/src/lib/job_manager.h
b/src/lib/job_manager.h
index f0673df1531bd933d0ebb6662795e20e18cc9a84..c6be2a78e754a053609513897ade1eceee1fa977 100644
(file)
--- a/
src/lib/job_manager.h
+++ b/
src/lib/job_manager.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2015
Carl Hetherington <cth@carlh.net>
- 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.
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
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 <http://www.gnu.org/licenses/>.
*/
*/
@@
-21,18
+22,22
@@
* @brief A simple scheduler for jobs.
*/
* @brief A simple scheduler for jobs.
*/
-#include
<list>
+#include
"signaller.h"
#include <boost/thread/mutex.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
+#include <list>
class Job;
class Job;
-extern void wait_for_jobs ();
+class Film;
+class Playlist;
+
+extern bool wait_for_jobs ();
/** @class JobManager
* @brief A simple scheduler for jobs.
*/
/** @class JobManager
* @brief A simple scheduler for jobs.
*/
-class JobManager : public boost::noncopyable
+class JobManager : public
Signaller, public
boost::noncopyable
{
public:
{
public:
@@
-41,25
+46,33
@@
public:
bool work_to_do () const;
bool errors () const;
bool work_to_do () const;
bool errors () const;
+ void analyse_audio (
+ boost::shared_ptr<const Film> film,
+ boost::shared_ptr<const Playlist> playlist,
+ boost::signals2::connection& connection,
+ boost::function<void()> ready
+ );
+
boost::signals2::signal<void (boost::weak_ptr<Job>)> JobAdded;
boost::signals2::signal<void (boost::weak_ptr<Job>)> JobAdded;
- boost::signals2::signal<void (boo
l
)> ActiveJobsChanged;
+ boost::signals2::signal<void (boo
st::optional<std::string>, boost::optional<std::string>
)> ActiveJobsChanged;
static JobManager* instance ();
static void drop ();
private:
/* This function is part of the test suite */
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 ();
JobManager ();
~JobManager ();
void scheduler ();
-
+ void start ();
+
mutable boost::mutex _mutex;
std::list<boost::shared_ptr<Job> > _jobs;
bool _terminate;
mutable boost::mutex _mutex;
std::list<boost::shared_ptr<Job> > _jobs;
bool _terminate;
- boo
l _last_active_jobs
;
+ boo
st::optional<std::string> _last_active_job
;
boost::thread* _scheduler;
static JobManager* _instance;
boost::thread* _scheduler;
static JobManager* _instance;