projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing FFmpeg include; fixes #989.
[dcpomatic.git]
/
src
/
lib
/
job.h
diff --git
a/src/lib/job.h
b/src/lib/job.h
index 5e3127dc158a432522590ffec566e5cfa1e21bbf..660ddaa132715dc7e4f4dba1cb647344492de441 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/>.
*/
*/
@@
-24,29
+25,30
@@
#ifndef DCPOMATIC_JOB_H
#define DCPOMATIC_JOB_H
#ifndef DCPOMATIC_JOB_H
#define DCPOMATIC_JOB_H
-#include
<string>
+#include
"signaller.h"
#include <boost/thread/mutex.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
+#include <string>
class Film;
/** @class Job
* @brief A parent class to represent long-running tasks which are run in their own thread.
*/
class Film;
/** @class Job
* @brief A parent class to represent long-running tasks which are run in their own thread.
*/
-class Job : public boost::enable_shared_from_this<Job>, public boost::noncopyable
+class Job : public boost::enable_shared_from_this<Job>, public
Signaller, public
boost::noncopyable
{
public:
Job (boost::shared_ptr<const Film>);
{
public:
Job (boost::shared_ptr<const Film>);
- virtual ~Job
() {}
+ virtual ~Job
();
/** @return user-readable name of this job */
virtual std::string name () const = 0;
virtual std::string json_name () const = 0;
/** Run this job in the current thread. */
virtual void run () = 0;
/** @return user-readable name of this job */
virtual std::string name () const = 0;
virtual std::string json_name () const = 0;
/** Run this job in the current thread. */
virtual void run () = 0;
-
+
void start ();
void pause ();
void resume ();
void start ();
void pause ();
void resume ();
@@
-63,7
+65,6
@@
public:
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 {
@@
-73,15
+74,14
@@
public:
void set_progress_unknown ();
void set_progress (float, bool force = false);
void sub (std::string);
void set_progress_unknown ();
void set_progress (float, bool force = false);
void sub (std::string);
- float progress () const;
- bool progress_unknown () const {
- return !_progress;
- }
+ boost::optional<float> progress () const;
boost::shared_ptr<const Film> film () const {
return _film;
}
boost::shared_ptr<const Film> film () const {
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;
@@
-99,15
+99,18
@@
protected:
FINISHED_ERROR, ///< the job has finished in error
FINISHED_CANCELLED ///< the job was cancelled
};
FINISHED_ERROR, ///< the job has finished in error
FINISHED_CANCELLED ///< the job was cancelled
};
-
+
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;
private:
void run_wrapper ();
boost::shared_ptr<const Film> _film;
private:
void run_wrapper ();
+ void set_progress_common (boost::optional<float> p);
boost::thread* _thread;
boost::thread* _thread;
@@
-119,13
+122,21
@@
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.
+ */
+ boost::condition_variable _pause_changed;
int _ran_for;
};
int _ran_for;
};