diff -r 6c08d4d7219e -r 9ccef81f02ab front_idill/extern/fajran-npTuioClient/TuioClient/TuioClient.h --- a/front_idill/extern/fajran-npTuioClient/TuioClient/TuioClient.h Thu Apr 12 13:09:46 2012 +0200 +++ b/front_idill/extern/fajran-npTuioClient/TuioClient/TuioClient.h Thu Apr 12 15:33:25 2012 +0200 @@ -1,8 +1,8 @@ /* - TUIO C++ Library - part of the reacTIVision project - http://reactivision.sourceforge.net/ + TUIO C++ Library - part of the reacTIVision project + http://reactivision.sourceforge.net/ - Copyright (c) 2005-2008 Martin Kaltenbrunner + Copyright (c) 2005-2008 Martin Kaltenbrunner This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* + Modified by alexandre.bastien@iri.centrepompidou.fr to manage TUIO strings. +*/ + #ifndef INCLUDED_TUIOCLIENT_H #define INCLUDED_TUIOCLIENT_H @@ -47,75 +51,75 @@ using namespace osc; class TuioClient : public PacketListener { - - public: - TuioClient(); - TuioClient(int p); - ~TuioClient(); + + public: + TuioClient(); + TuioClient(int p); + ~TuioClient(); - void start(bool lk=false); - void stop(); - bool isRunning() { return running; } - - - TuioObject* getTuioObject(long s_id); - TuioCursor* getTuioCursor(long s_id); - /* - * Ajouté par alexandre.bastien@iri.centrepompidou.fr - */ - TuioString* getTuioString(long s_id); - std::list getTuioObjects(); - std::list getTuioCursors(); - /* - * Ajouté par alexandre.bastien@iri.centrepompidou.fr - */ - std::list getTuioStrings(); - - void addTuioListener(TuioListener *listener); - void removeTuioListener(TuioListener *listener); + void start(bool lk=false); + void stop(); + bool isRunning() { return running; } + + + TuioObject* getTuioObject(long s_id); + TuioCursor* getTuioCursor(long s_id); + /* + * Ajouté par alexandre.bastien@iri.centrepompidou.fr + */ + TuioString* getTuioString(long s_id); + std::list getTuioObjects(); + std::list getTuioCursors(); + /* + * Ajouté par alexandre.bastien@iri.centrepompidou.fr + */ + std::list getTuioStrings(); + + void addTuioListener(TuioListener *listener); + void removeTuioListener(TuioListener *listener); - void ProcessPacket( const char *data, int size, const IpEndpointName& remoteEndpoint ); + void ProcessPacket( const char *data, int size, const IpEndpointName& remoteEndpoint ); - UdpListeningReceiveSocket *socket; + UdpListeningReceiveSocket *socket; - protected: - void ProcessBundle( const ReceivedBundle& b, const IpEndpointName& remoteEndpoint); - void ProcessMessage( const ReceivedMessage& m, const IpEndpointName& remoteEndpoint); + protected: + void ProcessBundle( const ReceivedBundle& b, const IpEndpointName& remoteEndpoint); + void ProcessMessage( const ReceivedMessage& m, const IpEndpointName& remoteEndpoint); - private: - std::list listenerList; + private: + std::list listenerList; - std::list objectList; - std::list aliveObjectList, objectBuffer; - std::list cursorList; - std::list aliveCursorList, cursorBuffer; - /* - * Ajouté par alexandre.bastien@iri.centrepompidou.fr - */ - std::list stringList; - std::list aliveStringList, stringBuffer; - - int32 currentFrame, lastFrame; - - long startTime; - long lastTime; - long getCurrentTime(); - - std::list freeCursorList, freeCursorBuffer; - /* - * Ajouté par alexandre.bastien@iri.centrepompidou.fr - */ - std::list freeStringList, freeStringBuffer; - int maxFingerID, maxStringID; - - #ifndef WIN32 - pthread_t thread; - #else - HANDLE thread; - #endif + std::list objectList; + std::list aliveObjectList, objectBuffer; + std::list cursorList; + std::list aliveCursorList, cursorBuffer; + /* + * Ajouté par alexandre.bastien@iri.centrepompidou.fr + */ + std::list stringList; + std::list aliveStringList, stringBuffer; + + int32 currentFrame, lastFrame; + + long startTime; + long lastTime; + long getCurrentTime(); + + std::list freeCursorList, freeCursorBuffer; + /* + * Ajouté par alexandre.bastien@iri.centrepompidou.fr + */ + std::list freeStringList, freeStringBuffer; + int maxFingerID, maxStringID; + + #ifndef WIN32 + pthread_t thread; + #else + HANDLE thread; + #endif - bool locked; - bool running; + bool locked; + bool running; }; #endif /* INCLUDED_TUIOCLIENT_H */