From da4c1fcad194f4f3f399f6a4a731df34567c95ef Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 16 Aug 2012 00:59:35 +0000
Subject: Remove Raul::Slave class. Merge Thread::stop() and Thread::join().
 Clean thread shut down without the use of pthread_cancel().

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4708 a436a847-0d15-0410-975c-d299462d15a1
---
 src/server/PreProcessor.hpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/server/PreProcessor.hpp')

diff --git a/src/server/PreProcessor.hpp b/src/server/PreProcessor.hpp
index fd886139..9b7fbd44 100644
--- a/src/server/PreProcessor.hpp
+++ b/src/server/PreProcessor.hpp
@@ -20,7 +20,8 @@
 #include <glibmm/thread.h>
 
 #include "raul/AtomicPtr.hpp"
-#include "raul/Slave.hpp"
+#include "raul/Semaphore.hpp"
+#include "raul/Thread.hpp"
 
 namespace Ingen {
 namespace Server {
@@ -29,13 +30,18 @@ class Event;
 class PostProcessor;
 class ProcessContext;
 
-class PreProcessor : public Raul::Slave
+class PreProcessor : public Raul::Thread
 {
 public:
 	explicit PreProcessor();
 
 	~PreProcessor();
 
+	virtual void join() {
+		_exit_flag = true;
+		_sem.post();
+	}
+
 	/** Return true iff no events are enqueued. */
 	inline bool empty() const { return !_head.get(); }
 
@@ -52,10 +58,11 @@ public:
 	                 bool            limit = true);
 
 protected:
-	virtual void _whipped();  ///< Prepare 1 event
+	virtual void _run();
 
 private:
 	Glib::Mutex            _mutex;
+	Raul::Semaphore        _sem;
 	Raul::AtomicPtr<Event> _head;
 	Raul::AtomicPtr<Event> _prepared_back;
 	Raul::AtomicPtr<Event> _tail;
-- 
cgit v1.2.1