Skip to content
Snippets Groups Projects
Commit ca2d9fb1 authored by Martin Kaltenbrunner's avatar Martin Kaltenbrunner
Browse files

disable TUIO_ADDED filter

parent 95ad8d81
Branches
No related tags found
No related merge requests found
......@@ -34,7 +34,7 @@ static void* ClientThreadFunc( void* obj )
int client = sender->tcp_client_list.back();
#endif
int connected = 1;
size_t connected = 1;
while (connected) {
connected = recv(client, buf, sizeof(buf),0);
}
......
......@@ -302,14 +302,14 @@ void TuioServer::startCursorBundle() {
if (source_name) (*oscPacket) << osc::BeginMessage( "/tuio/2Dcur") << "source" << source_name << osc::EndMessage;
(*oscPacket) << osc::BeginMessage( "/tuio/2Dcur") << "alive";
for (std::list<TuioCursor*>::iterator tuioCursor = cursorList.begin(); tuioCursor!=cursorList.end(); tuioCursor++) {
if ((*tuioCursor)->getTuioState()!=TUIO_ADDED) (*oscPacket) << (int32)((*tuioCursor)->getSessionID());
/*if ((*tuioCursor)->getTuioState()!=TUIO_ADDED)*/ (*oscPacket) << (int32)((*tuioCursor)->getSessionID());
}
(*oscPacket) << osc::EndMessage;
}
void TuioServer::addCursorMessage(TuioCursor *tcur) {
if (tcur->getTuioState()==TUIO_ADDED) return;
//if (tcur->getTuioState()==TUIO_ADDED) return;
float xpos = tcur->getX();
float xvel = tcur->getXSpeed();
......@@ -407,14 +407,14 @@ void TuioServer::startBlobBundle() {
if (source_name) (*oscPacket) << osc::BeginMessage( "/tuio/2Dblb") << "source" << source_name << osc::EndMessage;
(*oscPacket) << osc::BeginMessage( "/tuio/2Dblb") << "alive";
for (std::list<TuioBlob*>::iterator tuioBlob = blobList.begin(); tuioBlob!=blobList.end(); tuioBlob++) {
if ((*tuioBlob)->getTuioState()!=TUIO_ADDED) (*oscPacket) << (int32)((*tuioBlob)->getSessionID());
/*if ((*tuioBlob)->getTuioState()!=TUIO_ADDED)*/ (*oscPacket) << (int32)((*tuioBlob)->getSessionID());
}
(*oscPacket) << osc::EndMessage;
}
void TuioServer::addBlobMessage(TuioBlob *tblb) {
if (tblb->getTuioState()==TUIO_ADDED) return;
//if (tblb->getTuioState()==TUIO_ADDED) return;
float xpos = tblb->getX();
float xvel = tblb->getXSpeed();
......
......@@ -62,7 +62,7 @@ bool WebSockSender::sendOscPacket (osc::OutboundPacketStream *bundle) {
#endif
for (client = tcp_client_list.begin(); client!=tcp_client_list.end(); client++) {
int len = bundle->Size();
size_t len = bundle->Size();
// add WebSocket header on top
uint8_t header[4] = {
0x82,
......@@ -149,7 +149,7 @@ void WebSockSender::newClient( int tcp_client ) {
void WebSockSender::sha1( uint8_t digest[SHA1_HASH_SIZE], const uint8_t* inbuf, size_t length) {
size_t i, j;
int i, j;
int remaining_bytes;
uint32_t h0, h1, h2, h3, h4, a, b, c, d, e, temp;
uint32_t w[80];
......@@ -170,7 +170,7 @@ void WebSockSender::sha1( uint8_t digest[SHA1_HASH_SIZE], const uint8_t* inbuf,
for (i = 0; i < length + 9; i += 64) {
/* Perform any padding necessary. */
remaining_bytes = length - i;
remaining_bytes = (int)length - i;
if (remaining_bytes >= 64) {
memcpy(buf, inbuf + i, 64);
} else if (remaining_bytes >= 0) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment