Diff: ShoutcastConnector.cpp

Revision:

3:87023c28aff5

Parent:

2:9abcdc65c5b5

Child:

4:a3b7032f0776

--- a/ShoutcastConnector.cpp	Wed Jan 12 13:18:21 2011 +0000
+++ b/ShoutcastConnector.cpp	Thu Jan 13 13:02:20 2011 +0000
@@ -1,6 +1,6 @@
 #include "ShoutcastConnector.h"
 
-    
+
 enum wSTATE {NOP,PUT_HEADER} WriteState;
 enum rSTATE {GET_RESPONSE,GET_STREAM} ReadState;
 
@@ -10,38 +10,46 @@
 bool play;
 
 
-
-void statisticsOutput();
-
 int kb = 0;
-int readed = 0;int size = 0;
+int readed = 0;
+int size = 0;
 int metaint=0; // metadate interval
 
 
 
 
-ShoutcastConnector::ShoutcastConnector(VS1053* mp3, myCallBack_pfn callback)
-{
+
+ShoutcastConnector::ShoutcastConnector(VS1053* mp3, myCallBack_pfn callback) {
     _mp3 = mp3;
     _callback = callback;
-    
+    ReadState=GET_RESPONSE;
+    WriteState=PUT_HEADER;
+
 }
 
-int ShoutcastConnector::Connect(IpAddr address, int port)
-{
-    ReadState=GET_RESPONSE;
-    WriteState=PUT_HEADER;
-    
+int ShoutcastConnector::Connect(IpAddr address, int port) {
+
+    if ((ReadState!=GET_RESPONSE)||(WriteState!=PUT_HEADER)) {
+        Disconnect();
+        //wait
+        wait_ms(500);
+    }
+
     kb = 0;
     readed = 0;
     size = 0;
     metaint=0; // metadate interval
     play=false;
+    
+    for(int i=0; i< BUFFER_Z; i++) 
+        inbuf[i] = 0; // IP input buffer
+    for(int i=0; i< 800; i++) 
+        sResponse[i] = 0; // IP input buffer
 
-     Host server(address, port);                  // 128k mp3
-     IpAddr serverIp = server.getIp();
-   
-    printf("Connecting... %d.%d.%d.%d:%d\r\n",
+    Host server(address, port);                  // 128k mp3
+    IpAddr serverIp = server.getIp();
+
+    DEBUGOUT("ShoutcastConnector: Connecting... %d.%d.%d.%d:%d\r\n",
            serverIp[0],serverIp[1],serverIp[2],serverIp[3],port);
 
 
@@ -49,80 +57,91 @@
     TCPSocketErr bindErr = sock.connect(server);
 
     if (TCPSOCKET_OK != bindErr) {
-        printf("Error %d in sock.connect().\r\n", bindErr);
+        DEBUGOUT("ShoutcastConnector: Error %d in sock.connect().\r\n", bindErr);
         return -1;
     }
     return 0;
 }
 
-int ShoutcastConnector::Disconnect()
-{
+int ShoutcastConnector::Disconnect() {
     TCPSocketErr err = sock.close();
-    
+
+
     if (TCPSOCKET_OK != err) {
-        printf("Error %d in  ShoutcastConnector: Disconnect().\r\n", err);
+        DEBUGOUT("ShoutcastConnector: Error %d in Disconnect().\r\n", err);
         return -1;
+    } else {
+        DEBUGOUT("ShoutcastConnector: disconnected");
     }
-    else {
-        printf("ShoutcastConnector disconnected");
-    }
+
+    _mp3->stop();
+
+    ReadState=GET_RESPONSE;
+    WriteState=PUT_HEADER;
+
     return 0;
 }
 
 void ShoutcastConnector::onTCPSocketEvent(TCPSocketEvent e) {
     switch (e) {
         case TCPSOCKET_CONNECTED:
-           // DEBUGOUT("TCP Socket Connected\r\n"); // this printf disturb socket work correctly
+            // DEBUGOUT("TCP Socket Connected\r\n"); // this printf disturb socket work correctly
             Writeable();
             break; // we must comment out ?
         case TCPSOCKET_WRITEABLE:
-           // DEBUGOUT("TCP Socket Writeable\r\n");
+            // DEBUGOUT("TCP Socket Writeable\r\n");
             break;
         case TCPSOCKET_READABLE:
             //Can now read some data...
-           // DEBUGOUT("TCP Socket Readable\r\n");
+            // DEBUGOUT("TCP Socket Readable\r\n");
             Readable();
             break;//
         case TCPSOCKET_CONTIMEOUT:
-            DEBUGOUT("TCP Socket Timeout\r\n");
+            DEBUGOUT("ShoutcastConnector: TCP Socket Timeout\r\n");
+                    
+            ReadState=GET_RESPONSE;
+            WriteState=PUT_HEADER;
             break;
         case TCPSOCKET_CONRST:
-            DEBUGOUT("TCP Socket CONRST\r\n");
+            DEBUGOUT("ShoutcastConnector: TCP Socket CONRST\r\n");
+                    
+            ReadState=GET_RESPONSE;
+            WriteState=PUT_HEADER;
             break;
         case TCPSOCKET_CONABRT:
-            DEBUGOUT("TCP Socket CONABRT\r\n");
-            DEBUGOUT("Maybe Server Down...\r\n");
+            DEBUGOUT("ShoutcastConnector: TCP Socket CONABRT\r\n");
+            DEBUGOUT("ShoutcastConnector: Maybe Server Down...\r\n");
+                    
+            ReadState=GET_RESPONSE;
+            WriteState=PUT_HEADER;
             break;
         case TCPSOCKET_ERROR:
-            DEBUGOUT("TCP Socket Error\r\n");
+            DEBUGOUT("ShoutcastConnector: TCP Socket Error\r\n");
             break;
         case TCPSOCKET_DISCONNECTED:
             //Close socket...
-            DEBUGOUT("ShoutcastConnector Disconnected\r\n");
+            DEBUGOUT("ShoutcastConnector: Disconnected\r\n");
             sock.close();
             break;
     }// switch(e)
 }
 
 void ShoutcastConnector::Writeable() {
-    //Can now write some data...
-//        printf("TCP Socket Writable\r\n"); // debug
     switch (WriteState) {
         case PUT_HEADER:
             const char* str =
-//                  "GET /live HTTP/1.0\r\n"  // use this if solopiano
+//                "GET /live HTTP/1.0\r\n"  // use this if solopiano
                 "GET / HTTP/1.0\r\n"
                 "Host: gw\r\n"
                 "Accept: */*\r\n"
                 "User-Agent: mbed\r\n"
-//#ifdef METADATA
+
                 "Icy-MetaData: 1\r\n"   // send this if you want Metadata
-//#endif
 //                    "Connection: close\r\n"
                 "\r\n"
                 ;
             sock.send(str, strlen(str));
-            DEBUGOUT("\r\nHEADER:\r\n%s\r\n", str); // display PUT_HEADER
+            DEBUGOUT("\r\nShoutcastConnector: HEADER:\r\n%s\r\n", str); // display PUT_HEADER
             WriteState=NOP;
             ReadState=GET_RESPONSE;
             break;
@@ -134,11 +153,11 @@
 
 void ShoutcastConnector::Readable() {
     int len = 0, i=0;
-    char* cp;    
-    
+    char* cp;
+
     switch (ReadState) {
         case GET_RESPONSE:
-            len=sock.recv(inbuf, sizeof inbuf);
+         len=sock.recv(inbuf, sizeof inbuf);
             cp=strstr(inbuf,"\r\n\r\n");
             if (cp==NULL) {
                 inbuf[len]=0;
@@ -149,15 +168,15 @@
             //
             *cp=0;
             sprintf(sResponse+strlen(sResponse),"%s\r\n\r\n",inbuf);
-            DEBUGOUT("RESPONSE:\r\n%s",sResponse);
+            DEBUGOUT("ShoutcastConnector: RESPONSE:\r\n%s",sResponse);
             // get metaint value
             cp=strstr(sResponse,"icy-metaint:");
             if (cp==NULL) metaint=0;
             else sscanf(cp+strlen("icy-metaint:"),"%d",&metaint);
-            DEBUGOUT("\r\nmetaint: %d\r\n\r\n",metaint); //debug
+            DEBUGOUT("\r\nShoutcastConnector: metaint: %d\r\n\r\n",metaint); //debug
             //
             
-            DEBUGOUT("HeaderLen:%d",len);
+            DEBUGOUT("ShoutcastConnector: HeaderLen:%d\r\n",len);
             
             i=strlen(inbuf)+4; // bump bitstream right after response
             ReadState=GET_STREAM;
@@ -171,130 +190,89 @@
             };
             return;
             //
-         case GET_STREAM:
+        case GET_STREAM:
             // receive data ****repeatedly****
             while (len=sock.recv(inbuf, sizeof inbuf)) {
-                //DEBUGOUT("in")
-                //DEBUGOUT("%d\r\n",len)
-                
+
+
                 kb += len;
-                
-                
-                if(metaint > 0)
-                {
-                    if(readed + len > metaint)
-                    {
+
+
+                if (metaint > 0) {
+                    if (readed + len > metaint) {
                         //XXX
                         int startindex = metaint-readed;
                         size = inbuf[startindex];
-                        //DEBUGOUT("MetaData: %d,%d,%d\r\n",metaint,readed,len);
-                        //DEBUGOUT("MetaData: %d\r\n",size);
                         //Send first part of data
-                         while(_mp3->bufferFree() < startindex)               
-                        ;                                   // wait  
+                        while (_mp3->bufferFree() < startindex)
+                            ;                                   // wait
                         _mp3->bufferPutStream(inbuf, startindex);
-                        
-                        if(size>0)
-                        {
-                        //1.Fall : (metaint-readed)+size <= len
+
+                        if (size>0) {
+                            //1.Fall : (metaint-readed)+size <= len
                             //Text ausgeben
                             //rest an mp3 codec
-                            if((metaint-readed)+size <= len)
-                            {
-                               // for(i=0; i<size*16; i++)
-                               // DEBUGOUT("%c",inbuf[startindex + 1 + i]);
-                                _callback(&inbuf[startindex + 1], size*16);
+                            if ((metaint-readed)+size <= len) {
+                                int start =-1;
+                                int length = -1;
+
+                                for (int i = startindex + 1; i < startindex + 1 + size*16; i++) {
+                                    if (inbuf[i] == '\'') {
+                                        if (start == -1)
+                                            start = i+1-(startindex+1);
+                                        else
+                                            length = (i - (startindex+1)) - start; //last indexs - first index
+                                    }
+
+                                }
+                                _callback(&inbuf[startindex + 1], size*16, start ,length);
                                 //Send last part of data
-                                while(_mp3->bufferFree() < len-(startindex+1+size*16))               
-                                ;                                   // wait  
+                                while (_mp3->bufferFree() < len-(startindex+1+size*16))
+                                    ;                                   // wait
                                 readed = len-(startindex+1+size*16);
                                 _mp3->bufferPutStream(&inbuf[startindex+1+size*16], readed);
-                            }
-                            else
-                            {
-                                DEBUGOUT("Muh")
+                            } else {
+                                DEBUGOUT("ShoutcastConnector: Muh")
                             }
-                        }
-                        else
-                        {
-                           // DEBUGOUT("Title hasn't changed since the last metadata message\r\n");
+                        } else {
                             //Send second part of data
                             //XXX
-                            while(_mp3->bufferFree() < len-(startindex+1))               
-                            ;                                   // wait  
+                            while (_mp3->bufferFree() < len-(startindex+1))
+                                ;                                   // wait
                             //XXX
                             readed = len-(startindex+1);
                             _mp3->bufferPutStream(&inbuf[startindex+1], len-(startindex+1));
-                                                    
-                        }                                                
-                    }
-                    else
-                    {
+
+                        }
+                    } else {
                         readed += len;
-                        while(_mp3->bufferFree() < len)               
-                        ;                                   // wait  
+                        while (_mp3->bufferFree() < len)
+                            ;                                   // wait
                         _mp3->bufferPutStream(inbuf, len);
                     }
-                }                
-                else                
-                {
-                     while(_mp3->bufferFree() < len)               
-                    ;                                   // wait  
+                } else {
+                    while (_mp3->bufferFree() < len)
+                        ;                                   // wait
                     _mp3->bufferPutStream(inbuf, len);
                 }
-                // save len bytes              
-               
-                
-               
-                if(!play && _mp3->bufferCount() > 0.8 * BUFFER_SIZE){ 
+
+
+
+                if (!play && _mp3->bufferCount() > 0.8 * _mp3->bufferLength()) {
                     _mp3->play();
                     play = true;
-                    statisticsOutput();
                 }
-                
-                if(play &&  _mp3->bufferCount() < 0.1 * BUFFER_SIZE) 
-                {
+
+                if (play &&  _mp3->bufferCount() < 0.1 * _mp3->bufferLength()) {
                     _mp3->pause();
                     play = false;
-                    statisticsOutput();
                 }
-                
-                
+
+
             } // while (len=sock...)
-            
-            /*len=sock.recv(inbuf, sizeof inbuf);
-            while (i<len) {
-                            //sbuf.PutByte(inbuf[i]);i++;
-                            mp3.bufferSetByte(inbuf[i]);
-                            i++;
-                        } 
-                        */
-            //DEBUGOUT("out\r\n");
-               /* i=0;
-                while (i<BUFFER_Z) {
-                 // sbuf.PutByte(inbuf[i]);i++;
-                 //DEBUGOUT("%d",inbuf[i]); //debug
-                     while( == false) {
-                     DEBUGOUT("false %d", i);
-                     }
-                 i++;
-                 }//while
-                 */
-                // if(mp3.bufferPutStream(&inbuf[0], BUFFER_Z) == false) {
-                // DEBUGOUT("false")
-                // }
-                
-           
-           
+
+
+
             return; // get more strea
-            //
     } // switch (ReadState)
-}
-
-void statisticsOutput()
-{    
-    printf("Statistics\r\n");
-  //  printf("Buffer - Size: %i, Free: %i, Loaded: %i\r\n", BUFFER_SIZE, _mp3.bufferFree(), mp3.bufferCount());    
-    
-    //mp3.getAudioInfo();
 }
\ No newline at end of file