X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fthread.h;h=ae257078569c47844e0d4502886f5de403371885;hb=933356a36607f5d4480172e285071d4d7dfc5a7b;hp=937d161938b20aad593653bbe99ed882aeb77156;hpb=fe77fc6b869a71bf94d501a0762579f4ddbc5094;p=libs%2Fcore.git

diff --git a/source/core/thread.h b/source/core/thread.h
index 937d161..ae25707 100644
--- a/source/core/thread.h
+++ b/source/core/thread.h
@@ -1,12 +1,5 @@
-/*
-This file is part of libmspcore
-Copyright © 2006 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-#ifndef MSP_FRAMEWORK_THREAD_H_
-#define MSP_FRAMEWORK_THREAD_H_
-
-#include "types.h"
+#ifndef MSP_CORE_THREAD_H_
+#define MSP_CORE_THREAD_H_
 
 namespace Msp {
 
@@ -19,30 +12,30 @@ is started.
 */
 class Thread
 {
-public:
-	void join();
-	void cancel();
-	void kill();
-	virtual ~Thread();
-protected:
-	Thread(): launched_(false) { }
-	void launch();
-	virtual void main()=0;
-	void check_cancel();
 private:
-	ThreadHandle thread_;
-	bool         launched_;
+	struct Private;
 
+	Private *priv_;
+	bool launched_;
+
+protected:
+	Thread();
+private:
 	Thread(const Thread &);
 	Thread &operator=(const Thread &);
+public:
+	virtual ~Thread();
 
-#ifdef WIN32
-#	define THREAD_RETURN_ DWORD WINAPI
-#else
-#	define THREAD_RETURN_ void *
-#endif
-	static THREAD_RETURN_ main_(void *t) { ((Thread *)t)->main(); return 0; }
-#undef THREAD_RETURN_
+	/** Waits for the thread to exit.  Calling this from the thread will cause a
+	deadlock. */
+	void join();
+
+	/** Violently terminates the thread.  This should only be used as a last
+	resort, as the thread gets no chance to clean up. */
+	void kill();
+protected:
+	void launch();
+	virtual void main() = 0;
 };
 
 } // namespace Msp