Преглед на файлове

Bugfix for issue #40

Warning: Mp3stream is only capable of playing one stream... for now.
Jordy Sipkema преди 9 години
родител
ревизия
62213e5946
променени са 3 файла, в които са добавени 15 реда и са изтрити 5 реда
  1. 10 2
      main.c
  2. 4 3
      mp3stream.c
  3. 1 0
      mp3stream.h

+ 10 - 2
main.c

@@ -356,10 +356,18 @@ int main(void)
         if(KbGetKey() == KEY_01){
             //> "62.195.226.247";
             printf("KEY_01 DETECTED\n");
-            connectToStream(inet_addr("62.195.226.247"), 80, "/test.mp3");
-            play();
+
+            bool success = connectToStream(inet_addr("62.195.226.247"), 80, "/test.mp3");
+            if (success == true){
+                play();
+            }else {
+                printf("ConnectToStream failed. Aborting.\n\n");
+            }
             //playStream("62.195.226.247", 80, "/test.mp3");
         }
+        if(KbGetKey() == KEY_02){
+            killPlayerThread();
+        }
 
         if(KbGetKey() == KEY_DOWN)
         {

+ 4 - 3
mp3stream.c

@@ -44,10 +44,10 @@ bool connectToStream(u_long ipAddressStream, u_short port, char *radioUrl
     char* data;
 
     socket = NutTcpCreateSocket();
-    if (NutTcpConnect(socket, ipAddressStream, port))
+    if (NutTcpConnect(socket, inet_addr("62.195.226.247"), port))
     {
         // An error has occurred.
-        printf("ConnectToSteam: Error creating tcp socket.");
+        printf("ConnectToStream: Error creating tcp socket.\n");
         NutSleep(5000);
         result = false;
         return result;
@@ -142,8 +142,9 @@ u_char volumeDown(void)
 }
 
 void setVolume(void){
-    u_char volumeToSet = (127 - (VS_volume * 8)) % 128;
+    u_char volumeToSet = (128 - (VS_volume * 8)) % 129;
     VsSetVolume(volumeToSet, volumeToSet);
+    printf("setVolume %d\n", VS_volume);
 }
 
 void killPlayerThread(void)

+ 1 - 0
mp3stream.h

@@ -15,6 +15,7 @@
 
 bool play(void);
 bool connectToStream(u_long ipAddressStream, u_short port, char *radioUrl);
+void killPlayerThread(void);
 
 u_char volumeUp(void);
 u_char volumeDown(void);