projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
job.h
diff --git
a/src/lib/job.h
b/src/lib/job.h
index 0e57021e0c1cafbcc545c2502a94d7462f2c9834..d047913a0a750f9f82c57ee65a3dcdd86497732b 100644
(file)
--- a/
src/lib/job.h
+++ b/
src/lib/job.h
@@
-27,7
+27,6
@@
#include "signaller.h"
#include <boost/thread/mutex.hpp>
#include "signaller.h"
#include <boost/thread/mutex.hpp>
-#include <boost/enable_shared_from_this.hpp>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
#include <string>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
#include <string>
@@
-37,10
+36,10
@@
class Film;
/** @class Job
* @brief A parent class to represent long-running tasks which are run in their own thread.
*/
/** @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 Signaller, public boost::noncopyable
+class Job : public
std
::enable_shared_from_this<Job>, public Signaller, public boost::noncopyable
{
public:
{
public:
- explicit Job (
boost
::shared_ptr<const Film> film);
+ explicit Job (
std
::shared_ptr<const Film> film);
virtual ~Job ();
/** @return user-readable name of this job */
virtual ~Job ();
/** @return user-readable name of this job */
@@
-80,7
+79,7
@@
public:
void sub (std::string);
boost::optional<float> progress () const;
void sub (std::string);
boost::optional<float> progress () const;
-
boost
::shared_ptr<const Film> film () const {
+
std
::shared_ptr<const Film> film () const {
return _film;
}
return _film;
}
@@
-112,15
+111,16
@@
protected:
void set_message (std::string m);
int elapsed_sub_time () const;
void check_for_interruption_or_pause ();
void set_message (std::string m);
int elapsed_sub_time () const;
void check_for_interruption_or_pause ();
+ void stop_thread ();
-
boost
::shared_ptr<const Film> _film;
+
std
::shared_ptr<const Film> _film;
private:
void run_wrapper ();
void set_progress_common (boost::optional<float> p);
private:
void run_wrapper ();
void set_progress_common (boost::optional<float> p);
- boost::thread
*
_thread;
+ boost::thread _thread;
/** mutex for _state, _error*, _message */
mutable boost::mutex _state_mutex;
/** mutex for _state, _error*, _message */
mutable boost::mutex _state_mutex;