nearly finished

1 files changed, 7 insertions, 2 deletions

diff --git a/src/obtsDevice.h b/src/obtsDevice.h
index 33c130e..5f01277 100644
--- a/src/obtsDevice.h
+++ b/src/obtsDevice.h
@@ -69,7 +69,7 @@ class obtsDevice
 	obtsDevice();

         obtsDevice(string &imsi,string &imei,string &num,ofImage *_icon,ofVec2f _coords);

         virtual ~obtsDevice();

-	void draw(float timeScale); //units per second

+	void draw(float ts); //units per second

 	void connect();

 	void disconnect();

 	void ringing(obtsDevice *to);

@@ -78,9 +78,12 @@ class obtsDevice
 	void endCall();

 	void sms(obtsDevice *to);

 	void excite(float amount=0.99);

+	float timeCoord(float t);

     protected:

     private:

-	float  exciteLevel;

+	float exciteLevel;

+	float lastUsed;

+	float timeScale;

 	string IMSI,IMEI,number;

 	ofVec2f coords; //angular coords

 	vector<timeseg> connectionHistory;

@@ -90,6 +93,8 @@ class obtsDevice
 	bool active,calling;

     

 	float lastTime;

+    

+	ofColor colour;

 };