#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>
/** @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:
- 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 */
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;
}
boost::signals2::signal<void()> Progress;
/** Emitted from the UI thread when the job is finished */
boost::signals2::signal<void()> Finished;
+ /** Emitted from the job thread when the job is finished */
+ boost::signals2::signal<void()> FinishedImmediate;
protected:
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);
- boost::thread* _thread;
+ boost::thread _thread;
/** mutex for _state, _error*, _message */
mutable boost::mutex _state_mutex;