summaryrefslogtreecommitdiff
path: root/vfg/src/Asterisk.h
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2012-12-10 19:30:27 +0000
committerComment <tim@gray.(none)>2012-12-10 19:30:27 +0000
commitdba01ce870165fd8d8a5fea921cb31f7c4e8c25f (patch)
treebc7f877edaeb2047eac9606c9bf869bbe9f7776a /vfg/src/Asterisk.h
parent0bb92ced351b7fbba6e2e7036eae92037d08facf (diff)
fixed race condition in asterisk driver
Diffstat (limited to 'vfg/src/Asterisk.h')
-rwxr-xr-xvfg/src/Asterisk.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/vfg/src/Asterisk.h b/vfg/src/Asterisk.h
index 8093213..fb6097c 100755
--- a/vfg/src/Asterisk.h
+++ b/vfg/src/Asterisk.h
@@ -17,16 +17,16 @@ class Asterisk: public ofThread
public:
Asterisk(){
}
-
+
void start(){
-
+
}
void stop(){
stopThread();
}
//--------------------------
-
+
void setup(string passcode="1111",int millis=1000);
virtual ~Asterisk();
void startGame();
@@ -36,7 +36,8 @@ class Asterisk: public ofThread
int queued;
protected:
- void cmd(string s);
+ void cmd(string s);
+ void scmd(string s);
void threadedFunction();
private:
int startTime;
@@ -44,8 +45,9 @@ class Asterisk: public ofThread
int filenum;
ofxUDPManager udpConnection;
string playerCode;
- int statusPollMillis;
-
+ int statusPollMillis;
+
+
};
#endif // ASTERISK_H