nrinas/Cube4Fun
1
0
Fork 0
mirror of https://github.com/workinghard/Cube4Fun.git synced 2025-12-14 04:42:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
workinghard
2015-06-30 11:48:09 -07:00
parent 966d114fab f5454f3462
commit c293189f09
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Cube4Fun/src/CubeNetwork.cpp
View File

@@ -38,7 +38,6 @@ unsigned char receiveBuffer[32];
int bytesReceived; int bytesReceived;
int i,x; int i,x;
unsigned char color; unsigned char color;
//DialogSocket ds;
int frameChange = 0; int frameChange = 0;
int streamMode = 0; // 0 = off, 1 = frameStream, 2 = writeStream int streamMode = 0; // 0 = off, 1 = frameStream, 2 = writeStream
TCPStream* stream; TCPStream* stream;
@@ -102,8 +101,6 @@ bool frame1[3][64] = { {1,0,0,1,
1,0,0,1, 1,0,0,1,
0,0,0,0}}; 0,0,0,0}};
bool connectionEstablished = false;
void byte2uint32(unsigned char* bytes, u_int32_t msgLength) { void byte2uint32(unsigned char* bytes, u_int32_t msgLength) {
unsigned char *vp = (unsigned char *)&msgLength; unsigned char *vp = (unsigned char *)&msgLength;
bytes[0] = vp[0]; // int32 to byte array conversion bytes[0] = vp[0]; // int32 to byte array conversion
@@ -237,7 +234,7 @@ void CubeNetwork::sendBytes(const unsigned char* byteBuffer, unsigned int byteLe
printf("1: %u\n", myBuffer[1]); printf("1: %u\n", myBuffer[1]);
printf("2: %u\n", myBuffer[2]); printf("2: %u\n", myBuffer[2]);
printf("3: %u\n", myBuffer[3]); printf("3: %u\n", myBuffer[3]);
printf("ret: %u\n", ret); printf("ret: %lu\n", ret);
// send bytes to write // send bytes to write
stream->send(reinterpret_cast<const char*>(byteBuffer), byteLength); stream->send(reinterpret_cast<const char*>(byteBuffer), byteLength);
@@ -267,7 +264,7 @@ void CubeNetwork::updateFrame(const unsigned char * frameSequence, unsigned int
} }
bool CubeNetwork::openConnection(const char* ipAddr, unsigned int port) { bool CubeNetwork::openConnection(const char* ipAddr, unsigned int port) {
connectionEstablished = false; bool connectionEstablished = false;
printf("Try to open the connection\n"); printf("Try to open the connection\n");
//std::string ipAddr_str(reinterpret_cast<const char*>(ipAddr)); //std::string ipAddr_str(reinterpret_cast<const char*>(ipAddr));
//Poco::UInt16 portNr = port; //Poco::UInt16 portNr = port;
@@ -283,7 +280,6 @@ bool CubeNetwork::openConnection(const char* ipAddr, unsigned int port) {
} }
void CubeNetwork::closeConnection() { void CubeNetwork::closeConnection() {
connectionEstablished = false;
msgCloseFrameStream(); msgCloseFrameStream();
delete stream; delete stream;
streamMode = 0; streamMode = 0;
@@ -291,9 +287,8 @@ void CubeNetwork::closeConnection() {
bool CubeNetwork::connected() { bool CubeNetwork::connected() {
if (stream) { if (stream) {
connectionEstablished = true; return true;
}else{ }else{
connectionEstablished = false; return false;
} }
return connectionEstablished;
} }