Diff: main.cpp

Revision:

18:c760ba93b881

Parent:

7:15fdc55dbf66

--- a/main.cpp	Thu Dec 05 03:21:55 2019 +0000
+++ b/main.cpp	Thu Dec 05 04:43:25 2019 +0000
@@ -38,10 +38,12 @@
 Thread thread1, thread2, thread3;
 Ticker nextsample;
 int songNdx = 0;
+int songnum = 1;
+const unsigned short *playingSong = NULL;
 
 // mutex to make the lcd lib thread safe
 Mutex lcd_mutex;
-int songnum = 1;
+
 AnalogIn joy_pot(p16);
 
 // Thread 1
@@ -128,8 +130,8 @@
 // this thread plays music using the ticker class
 void playsound() {
     if (playing) {
-        //DACout = song[songNdx++];
-        //if (i>**songlength**) i 
+        DACout = playingSong[songNdx++];
+//        if (i>**songlength**) i 
     } else {
         DACout = 0;
         songNdx = 0;
@@ -145,19 +147,21 @@
 //    nextsample.attach(&playsound, 1.0/8000.0);
     //startup sound
     myRGBled = blue; //tested to make sure led works, we can use whatever color(s) here
-    FILE *wave_file;
-    wave_file=fopen("/sd/cheer.wav","r");
-    waver.play(wave_file);
-    fclose(wave_file);
+//    FILE *wave_file;
+//    wave_file=fopen("/sd/cheer.wav","r");
+//    waver.play(wave_file);
+//    fclose(wave_file);
     while(1) 
     {
         
         if (songselect){
+                myRGBled = yellow;
                 myled = 0;
+                playing = true;
                 homescreen = false;
                 lcd_mutex.lock();
                 uLCD.cls();
-                uLCD.printf("You selected song %2d",songnum);
+                uLCD.printf("You selected song %2d", songnum);
                 lcd_mutex.unlock();
                 //add case statement based on songnum or something
                 //code for playing song from sd
@@ -165,38 +169,42 @@
                 {
                 case 1:
                 {
-                FILE *wave_file;
-                wave_file =fopen("/sd/4180 final project/Fireflies.wav", "r");
-                waver.play(wave_file);
-                fclose(wave_file);
-                break;
+                    playingSong = fireflies;
+                    // FILE *wave_file;
+                    // wave_file =fopen("/sd/4180 final project/Fireflies.wav", "r");
+                    // waver.play(wave_file);
+                    // fclose(wave_file);
+                    break;
                 }
                 case 2:
                 {
-                FILE *wave_file;
-                wave_file =fopen("/sd/4180 final project/The_Middle.wav", "r");
-                waver.play(wave_file);
-                fclose(wave_file);
-                break;
+                    playingSong = the_middle;
+                    // FILE *wave_file;
+                    // wave_file =fopen("/sd/4180 final project/The_Middle.wav", "r");
+                    // waver.play(wave_file);
+                    // fclose(wave_file);
+                    break;
                 }
                 case 3:
                 {
-                FILE *wave_file;
-                wave_file =fopen("/sd/4180 final project/Stacy's_Mom.wav", "r");
-                waver.play(wave_file);
-                fclose(wave_file);
-                break;
+                    playingSong = stacys_mom;
+                    // FILE *wave_file;
+                    // wave_file =fopen("/sd/4180 final project/Stacy's_Mom.wav", "r");
+                    // waver.play(wave_file);
+                    // fclose(wave_file);
+                    break;
                 }
                 case 4:
                 {
-                FILE *wave_file;
-                wave_file =fopen("/sd/4180 final project/Sins_!_Tragedies.wav", "r");
-                waver.play(wave_file);
-                fclose(wave_file);
-                break;
+                    playingSong = sins;
+                    // FILE *wave_file;
+                    // wave_file =fopen("/sd/4180 final project/Sins_!_Tragedies.wav", "r");
+                    // waver.play(wave_file);
+                    // fclose(wave_file);
+                    break;
                 }
                 default:
-                break;
+                    break;
             }
                 
                 }