Revision 4:ebdd1cf0c9f7, committed 2015-08-17

Comitter:

ollie8

Date:

Mon Aug 17 20:50:43 2015 +0000

Parent:

3:51a66c975910

Child:

5:77a5d031f270

Commit message:

added handlers for disconnect and commit messages.

Changed in this revision

--- a/JAudioStream.cpp	Fri Aug 14 15:54:03 2015 +0000
+++ b/JAudioStream.cpp	Mon Aug 17 20:50:43 2015 +0000
@@ -6,6 +6,7 @@
     cont = "cont";
     cond = "cond";
     dcon = "dcon";
+    dctd = "dctd";
     rqst = "rqst";
     begn = "begn";
     comt = "comt";
@@ -29,9 +30,7 @@
 }
 
 bool JAudioStream::read(char *buffer, int size) {
-    INFO("Reading...");
     socket.receiveFrom(endPoint, buffer, size);
-    INFO("Received: %s", buffer);
     return true;
 }
 
@@ -64,27 +63,19 @@
 }
 
 void JAudioStream::buildMeassge(char* cmd, int param, char* data, char* message) {
-    INFO("Building message...");
     char bParam[MESSAGE_COMP_SIZE];
     char i;
-    INFO("Adding command");
     for (i=0; i<MESSAGE_COMP_SIZE; i++) {
         message[i] = cmd[i];
-        INFO("char = %u", message[i]);
     }
-    INFO("Adding param");
     intTocharArr(param, bParam);
     for (i=MESSAGE_COMP_SIZE; i<MESSAGE_SIZE; i++) {
         message[i] = bParam[i-MESSAGE_COMP_SIZE];
-        INFO("char = %u", message[i]);
     }
-    INFO("Adding data");
     char dataSize = MESSAGE_SIZE*2;
     for (i=MESSAGE_SIZE; i<dataSize; i++) {
         message[i] = data[i-MESSAGE_SIZE];
-        INFO("char = %u", message[i]);
     }
-    INFO("Message complete. %d", sizeof(message));
 }
 
 void JAudioStream::intTocharArr(int value, char* buff) {
@@ -95,7 +86,6 @@
 }
 
 void JAudioStream::send(char* data, int size ) {
-    INFO("Sending: %s %d", data, size);
     socket.sendTo(endPoint, data, size);
 }
 
@@ -108,6 +98,8 @@
     if (read(resp, MAX_PACKT)) {
         if (memcmp(resp, cond, 4) == 0) {
             connected = true;
+        } else if (memcmp(resp, dctd, 4) == 0) {
+            connected = false;
         } else if (memcmp(resp, hrbt, 4) == 0) {
             char message[MESSAGE_SIZE];
             buildMeassge(hrbt, -1, message);
@@ -115,6 +107,8 @@
         } else if (memcmp(resp, begn, 4) == 0) {
             memmove(&nowPlaying[0], &resp[4], 20);
             inTransmission = true;
+        } else if (memcmp(resp, comt, 4) == 0) {
+            inTransmission = false;
         }
     }
 }

--- a/JAudioStream.h	Fri Aug 14 15:54:03 2015 +0000
+++ b/JAudioStream.h	Mon Aug 17 20:50:43 2015 +0000
@@ -4,7 +4,7 @@
 #include "EthernetInterface.h"
 #include "UDPSocket.h"
 
-#define MAX_PACKT 48
+#define MAX_PACKT 32
 #define MESSAGE_SIZE 8
 #define MESSAGE_COMP_SIZE 4
 #define REQUEST_RESPONSE_MODE 1
@@ -14,6 +14,7 @@
         char* cont;
         char* cond;
         char* dcon;
+        char* dctd;
         char* rqst;
         char* begn;
         char* comt;