From dba01ce870165fd8d8a5fea921cb31f7c4e8c25f Mon Sep 17 00:00:00 2001 From: Comment Date: Mon, 10 Dec 2012 19:30:27 +0000 Subject: fixed race condition in asterisk driver --- vfg/src/Asterisk.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'vfg/src/Asterisk.h') 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 -- cgit v1.2.3