summaryrefslogtreecommitdiff
path: root/muse2/muse/thread.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-03-15 18:21:23 +0000
committerFlorian Jung <flo@windfisch.org>2012-03-15 18:21:23 +0000
commit27b7bf6815cda7abb67026c37b3e44daee1803cb (patch)
tree0b9d1c0bc84ac7ff8032e707f2b5fb4e0aaabb5c /muse2/muse/thread.h
parent2d6f113a10eb485694e20a78500f650776d701e3 (diff)
merged with trunk
Diffstat (limited to 'muse2/muse/thread.h')
-rw-r--r--muse2/muse/thread.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/muse2/muse/thread.h b/muse2/muse/thread.h
index 755754f9..ab897834 100644
--- a/muse2/muse/thread.h
+++ b/muse2/muse/thread.h
@@ -70,7 +70,6 @@ struct ThreadMsg {
class Thread {
const char* _name;
volatile bool _running;
- //int realTimePriority;
int _pollWait; // poll timeout in msec (-1 = infinite)
pthread_t thread;
@@ -78,7 +77,7 @@ class Thread {
int toThreadFdw; // message to thread (app write)
PollList plist;
-// pthread_mutex_t lock;
+// pthread_mutex_t lock; DELETETHIS 2
// pthread_cond_t ready;
void* userPtr;
@@ -95,13 +94,11 @@ class Thread {
virtual void defaultTick() {}
public:
- //Thread(int prio, const char* name);
Thread(const char* name);
virtual ~Thread();
const char* name() const { return _name; }
- //virtual void start(void* ptr=0);
virtual void start(int priority, void* ptr=0);
void stop(bool);