Revision 55:5a441d3b0d57, committed 2019-09-23

Comitter:

roryhand

Date:

Mon Sep 23 21:09:51 2019 +0000

Parent:

54:606a83fff291

Child:

56:3755c53ac4c6

Commit message:

WIP - trying to read in sizes of data, so as we know whereabouts our file position indicators will need to go to, when all the sound is amalgamated into one huge file

Changed in this revision

--- a/NotchingDemo.cpp	Mon Sep 23 20:23:20 2019 +0000
+++ b/NotchingDemo.cpp	Mon Sep 23 21:09:51 2019 +0000
@@ -555,7 +555,7 @@
 */
     timer_open.reset();
     timer_open.start();
-    wavfile1 = sd.open("/sd/mydir/SoundDecoder_second/01.wav","rb");
+    wavfile1 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
     if(wavfile1 == NULL) {
         printf("Cannot Open wavfile1\n\r");
     }
@@ -588,13 +588,156 @@
     Sound1 = ReadFileInfo(Sound1,wavfile1);
     Sound2 = ReadFileInfo(Sound2,wavfile2);
     Sound3 = ReadFileInfo(Sound3,wavfile3);
-    /*
+    
     FILE* wavfile4 = fopen("/sd/mydir/SoundDecoder_second/04.wav","rb");
     if(wavfile4 == NULL) {
         printf("Cannot Open wavfile4\n\r");
     }
+    classSoundFile Sound4;
     Sound4 = ReadFileInfo(Sound4,wavfile4);
-    */
+    fclose(wavfile4);
+    
+        FILE* wavfile5 = fopen("/sd/mydir/SoundDecoder_second/05.wav","rb");
+    if(wavfile5 == NULL) {
+        printf("Cannot Open wavfile5\n\r");
+    }
+    classSoundFile Sound5;
+    Sound5 = ReadFileInfo(Sound5,wavfile5);
+    fclose(wavfile5);
+    
+    
+        FILE* wavfile6 = fopen("/sd/mydir/SoundDecoder_second/06.wav","rb");
+    if(wavfile6 == NULL) {
+        printf("Cannot Open wavfile6\n\r");
+    }
+    classSoundFile Sound6;
+    Sound6 = ReadFileInfo(Sound6,wavfile6);
+    fclose(wavfile6);    
+    
+    
+        FILE* wavfile7 = fopen("/sd/mydir/SoundDecoder_second/07.wav","rb");
+    if(wavfile7 == NULL) {
+        printf("Cannot Open wavfile7\n\r");
+    }
+    classSoundFile Sound7;
+    Sound7 = ReadFileInfo(Sound7,wavfile7);
+    fclose(wavfile7);    
+    
+    
+            FILE* wavfile8 = fopen("/sd/mydir/SoundDecoder_second/08.wav","rb");
+    if(wavfile8 == NULL) {
+        printf("Cannot Open wavfile8\n\r");
+    }
+    classSoundFile Sound8;
+    Sound8 = ReadFileInfo(Sound8,wavfile8);
+    fclose(wavfile8);     
+    
+    
+    
+            FILE* wavfile9 = fopen("/sd/mydir/SoundDecoder_second/09.wav","rb");
+    if(wavfile9 == NULL) {
+        printf("Cannot Open wavfile9\n\r");
+    }
+    classSoundFile Sound9;
+    Sound9 = ReadFileInfo(Sound9,wavfile9);
+    fclose(wavfile9);      
+    
+    
+            FILE* wavfile10 = fopen("/sd/mydir/SoundDecoder_second/10.wav","rb");
+    if(wavfile10 == NULL) {
+        printf("Cannot Open wavfile10\n\r");
+    }
+    classSoundFile Sound10;
+    Sound10 = ReadFileInfo(Sound10,wavfile10);
+    fclose(wavfile10);
+    
+    
+            FILE* wavfile11 = fopen("/sd/mydir/SoundDecoder_second/11.wav","rb");
+    if(wavfile11 == NULL) {
+        printf("Cannot Open wavfile11\n\r");
+    }
+    classSoundFile Sound11;
+    Sound11 = ReadFileInfo(Sound11,wavfile11);
+    fclose(wavfile11);  
+    
+    
+            FILE* wavfile12 = fopen("/sd/mydir/SoundDecoder_second/12.wav","rb");
+    if(wavfile12 == NULL) {
+        printf("Cannot Open wavfile12\n\r");
+    }
+    classSoundFile Sound12;
+    Sound12 = ReadFileInfo(Sound12,wavfile12);
+    fclose(wavfile12);  
+    
+            FILE* wavfile13 = fopen("/sd/mydir/SoundDecoder_second/13.wav","rb");
+    if(wavfile13 == NULL) {
+        printf("Cannot Open wavfile13\n\r");
+    }
+    classSoundFile Sound13;
+    Sound13 = ReadFileInfo(Sound13,wavfile13);
+    fclose(wavfile13);  
+    
+    
+            FILE* wavfile14 = fopen("/sd/mydir/SoundDecoder_second/14.wav","rb");
+    if(wavfile14 == NULL) {
+        printf("Cannot Open wavfile14\n\r");
+    }
+    classSoundFile Sound14;
+    Sound14 = ReadFileInfo(Sound14,wavfile14);
+    fclose(wavfile14);  
+    
+    
+            FILE* wavfile15 = fopen("/sd/mydir/SoundDecoder_second/15.wav","rb");
+    if(wavfile15 == NULL) {
+        printf("Cannot Open wavfile15\n\r");
+    }
+    classSoundFile Sound15;
+    Sound15 = ReadFileInfo(Sound15,wavfile15);
+    fclose(wavfile15);  
+    
+    
+            FILE* wavfile16 = fopen("/sd/mydir/SoundDecoder_second/16.wav","rb");
+    if(wavfile16 == NULL) {
+        printf("Cannot Open wavfile16\n\r");
+    }
+    classSoundFile Sound16;
+    Sound16 = ReadFileInfo(Sound16,wavfile16);
+    fclose(wavfile16);  
+    
+    
+            FILE* wavfile17 = fopen("/sd/mydir/SoundDecoder_second/17.wav","rb");
+    if(wavfile17 == NULL) {
+        printf("Cannot Open wavfile17\n\r");
+    }
+    classSoundFile Sound17;
+    Sound17 = ReadFileInfo(Sound17,wavfile17);
+    fclose(wavfile17);  
+    
+    
+            FILE* wavfile18 = fopen("/sd/mydir/SoundDecoder_second/18.wav","rb");
+    if(wavfile18 == NULL) {
+        printf("Cannot Open wavfile18\n\r");
+    }
+    classSoundFile Sound18;
+    Sound18 = ReadFileInfo(Sound18,wavfile18);
+    fclose(wavfile18);  
+    
+    
+            FILE* wavfile19 = fopen("/sd/mydir/SoundDecoder_second/19.wav","rb");
+    if(wavfile19 == NULL) {
+        printf("Cannot Open wavfile19\n\r");
+    }
+    classSoundFile Sound19;
+    Sound19 = ReadFileInfo(Sound19,wavfile19);
+    fclose(wavfile19);  
+    
+    FILE* f1 = fopen("/sd/mydir/SoundDecoder_second/01.txt","rb");
+    
+    fprintf(f1, Sound1.FileInfo.FileData.subchunk2_size);
+    
+    
+            
+    
 
     fclose(wavfile2);
     fclose(wavfile3);
@@ -659,7 +802,7 @@
     //printf("wav_format.sample_rate: %d\n\r",FileInfo.FileFormat.sample_rate);
 
     fread(&Sound.FileInfo.FileData,sizeof(Sound.FileInfo.FileData),1,wav_file);
-    printf("wav_data.subchunk2_size: %d\n\r",FileInfo.FileData.subchunk2_size);
+    printf("wav_data.subchunk2_size: %d\n\r",Sound.FileInfo.FileData.subchunk2_size);
     Sound.FileInfo.slice_buf = ( char *)malloc(Sound.FileInfo.FileFormat.block_align);
     fread(Sound.FileInfo.slice_buf,Sound.FileInfo.FileFormat.block_align,1,wav_file);   //This isnt actually required, its just a test
     Sound.FileInfo.num_slices = Sound.FileInfo.FileData.subchunk2_size/Sound.FileInfo.FileFormat.block_align;