projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a load of explicit keywords.
[dcpomatic.git]
/
src
/
lib
/
job.h
diff --git
a/src/lib/job.h
b/src/lib/job.h
index 4e52e76a1cf6d845741f502882e0792ca5c43ec2..e5552e49ea8f63acec13443fccf29cc3d6f6b7a9 100644
(file)
--- a/
src/lib/job.h
+++ b/
src/lib/job.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012 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/>.
*/
*/
@@
-39,8
+40,8
@@
class Film;
class Job : public boost::enable_shared_from_this<Job>, public Signaller, public boost::noncopyable
{
public:
class Job : public boost::enable_shared_from_this<Job>, public Signaller, public boost::noncopyable
{
public:
-
Job (boost::shared_ptr<const Film>
);
- virtual ~Job
() {}
+
explicit Job (boost::shared_ptr<const Film> film
);
+ virtual ~Job
();
/** @return user-readable name of this job */
virtual std::string name () const = 0;
/** @return user-readable name of this job */
virtual std::string name () const = 0;
@@
-49,7
+50,8
@@
public:
virtual void run () = 0;
void start ();
virtual void run () = 0;
void start ();
- void pause ();
+ void pause_by_user ();
+ void pause_by_priority ();
void resume ();
void cancel ();
void resume ();
void cancel ();
@@
-59,12
+61,12
@@
public:
bool finished_ok () const;
bool finished_in_error () const;
bool finished_cancelled () const;
bool finished_ok () const;
bool finished_in_error () const;
bool finished_cancelled () const;
- bool paused () const;
+ bool paused_by_user () const;
+ bool paused_by_priority () const;
std::string error_summary () const;
std::string error_details () const;
std::string error_summary () const;
std::string error_details () const;
- int elapsed_time () const;
virtual std::string status () const;
std::string json_status () const;
std::string sub_name () const {
virtual std::string status () const;
std::string json_status () const;
std::string sub_name () const {
@@
-80,6
+82,8
@@
public:
return _film;
}
return _film;
}
+ void when_finished (boost::signals2::connection& connection, boost::function<void()> finished);
+
boost::signals2::signal<void()> Progress;
/** Emitted from the UI thread when the job is finished */
boost::signals2::signal<void()> Finished;
boost::signals2::signal<void()> Progress;
/** Emitted from the UI thread when the job is finished */
boost::signals2::signal<void()> Finished;
@@
-92,7
+96,8
@@
protected:
enum State {
NEW, ///< the job hasn't been started yet
RUNNING, ///< the job is running
enum State {
NEW, ///< the job hasn't been started yet
RUNNING, ///< the job is running
- PAUSED, ///< the job has been paused
+ PAUSED_BY_USER, ///< the job has been paused
+ PAUSED_BY_PRIORITY, ///< the job has been paused
FINISHED_OK, ///< the job has finished successfully
FINISHED_ERROR, ///< the job has finished in error
FINISHED_CANCELLED ///< the job was cancelled
FINISHED_OK, ///< the job has finished successfully
FINISHED_ERROR, ///< the job has finished in error
FINISHED_CANCELLED ///< the job was cancelled
@@
-100,6
+105,8
@@
protected:
void set_state (State);
void set_error (std::string s, std::string d);
void set_state (State);
void set_error (std::string s, std::string d);
+ int elapsed_sub_time () const;
+ void check_for_interruption_or_pause ();
boost::shared_ptr<const Film> _film;
boost::shared_ptr<const Film> _film;
@@
-118,13
+125,16
@@
private:
std::string _error_summary;
std::string _error_details;
std::string _error_summary;
std::string _error_details;
- /** time that this
sub-
job was started */
+ /** time that this job was started */
time_t _start_time;
time_t _start_time;
+ /** time that this sub-job was started */
+ time_t _sub_start_time;
std::string _sub_name;
std::string _sub_name;
- /** mutex for _progress */
+ /** mutex for _progress
and _last_progress_update
*/
mutable boost::mutex _progress_mutex;
boost::optional<float> _progress;
mutable boost::mutex _progress_mutex;
boost::optional<float> _progress;
+ boost::optional<struct timeval> _last_progress_update;
/** condition to signal changes to pause/resume so that we know when to wake;
this could be a general _state_change if it made more sense.
/** condition to signal changes to pause/resume so that we know when to wake;
this could be a general _state_change if it made more sense.