pot/merge.

[dcpomatic.git] / src / lib / job_manager.h

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index e0b72994df9dd2ab87495df0c6be3eb710afca2e..d4287f8746d667fd999d1d27450cdd9ef03150ae 100644 (file)
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -32,6 +32,7 @@
 class Job;
 class Film;
 class Playlist;
+struct threed_test7;
 
 extern bool wait_for_jobs ();
 
@@ -73,6 +74,7 @@ public:
 private:
        /* This function is part of the test suite */
        friend bool ::wait_for_jobs ();
+       friend struct threed_test7;
 
        JobManager ();
        ~JobManager ();
@@ -91,7 +93,7 @@ private:
        boost::shared_ptr<Job> _paused_job;
 
        boost::optional<std::string> _last_active_job;
-       boost::thread* _scheduler;
+       boost::thread _scheduler;
 
        static JobManager* _instance;
 };