Revision 88:76a4563ee9c7, committed 2019-10-02

Comitter:

roryhand

Date:

Wed Oct 02 20:37:50 2019 +0000

Parent:

62:ac63dfe15ef9

Child:

89:936f37f90cc2

Commit message:

WIP - branch. Have performed tests where I have the exact same number of classSoundFile objects, but have no issues unlike in the top branch. Makes absolutely no sense whatsoever.

Changed in this revision

--- a/NotchingDemo.cpp	Fri Sep 27 22:33:55 2019 +0000
+++ b/NotchingDemo.cpp	Wed Oct 02 20:37:50 2019 +0000
@@ -437,127 +437,12 @@
     sampletick.attach(&isr,1.0/sampling_freq);  //1/16000
     //fileswitch_tick.attach(&FileSwitch_isr,6.0);//So we can switch between playing file 1 and file 2, including opening and closing
     //not convinced we need this above line at the moment!!
-    /*
-FILE*   f1 = fopen("/sd/mydir/SoundDecoder_second/01.wav","rb");
-    
-    
-    if(f1 == NULL) {
-        printf("Cannot Open f1\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f1));
 
-FILE*   f2 = fopen("/sd/mydir/SoundDecoder_second/02.wav","rb");
-    if(f2 == NULL) {
-        printf("Cannot Open f2\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f2));
-FILE*   f3 = fopen("/sd/mydir/SoundDecoder_second/03.wav","rb");
-    if(f3 == NULL) {
-        printf("Cannot Open f3\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f3));
-
-FILE*   f4 = fopen("/sd/mydir/SoundDecoder_second/04.wav","rb");
-    if(f4 == NULL) {
-        printf("Cannot Open f4\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f4));
-FILE*   f5 = fopen("/sd/mydir/SoundDecoder_second/05.wav","rb");
-    if(f5 == NULL) {
-        printf("Cannot Open f5\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f5));
-FILE*   f6 = fopen("/sd/mydir/SoundDecoder_second/06.wav","rb");
-    if(f6 == NULL) {
-        printf("Cannot Open f6\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f6));
-FILE*   f7 = fopen("/sd/mydir/SoundDecoder_second/07.wav","rb");
-    if(f7 == NULL) {
-        printf("Cannot Open f7\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f7));
-FILE*   f8 = fopen("/sd/mydir/SoundDecoder_second/08.wav","rb");
-    if(f8 == NULL) {
-        printf("Cannot Open f8\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f8));
-FILE*   f9 = fopen("/sd/mydir/SoundDecoder_second/09.wav","rb");
-    if(f9 == NULL) {
-        printf("Cannot Open f9\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f9));
-FILE*   f10 = fopen("/sd/mydir/SoundDecoder_second/10.wav","rb");
-    if(f10 == NULL) {
-        printf("Cannot Open f10\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f10));
-FILE*   f11 = fopen("/sd/mydir/SoundDecoder_second/11.wav","rb");
-    if(f11 == NULL) {
-        printf("Cannot Open f11\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f11));
-FILE*   f12 = fopen("/sd/mydir/SoundDecoder_second/12.wav","rb");
-    if(f12 == NULL) {
-        printf("Cannot Open f12\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f12));
-FILE*   f13 = fopen("/sd/mydir/SoundDecoder_second/13.wav","rb");
-    if(f13 == NULL) {
-        printf("Cannot Open f13\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f13));
-FILE*   f14 = fopen("/sd/mydir/SoundDecoder_second/14.wav","rb");
-    if(f14 == NULL) {
-        printf("Cannot Open f14\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f14));
-FILE*   f15 = fopen("/sd/mydir/SoundDecoder_second/15.wav","rb");
-    if(f15 == NULL) {
-        printf("Cannot Open f15\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f15));
-FILE*   f16 = fopen("/sd/mydir/SoundDecoder_second/16.wav","rb");
-    if(f16 == NULL) {
-        printf("Cannot Open f16\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f16));
-FILE*   f17 = fopen("/sd/mydir/SoundDecoder_second/17.wav","rb");
-    if(f17 == NULL) {
-        printf("Cannot Open f17\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f17));
-FILE*   f18 = fopen("/sd/mydir/SoundDecoder_second/18.wav","rb");
-    if(f18 == NULL) {
-        printf("Cannot Open f18\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f18));
-FILE*   f19 = fopen("/sd/mydir/SoundDecoder_second/19.wav","rb");
-    if(f19 == NULL) {
-        printf("Cannot Open f19\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f19));
-FILE*   f20 = fopen("/sd/mydir/SoundDecoder_second/20.wav","rb");
-    if(f20 == NULL) {
-        printf("Cannot Open f20\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f20));
-FILE*   f21 = fopen("/sd/mydir/SoundDecoder_second/21.wav","rb");
-    if(f21 == NULL) {
-        printf("Cannot Open f21\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f21));
-FILE*   f22 = fopen("/sd/mydir/SoundDecoder_second/22.wav","rb");
-    if(f22 == NULL) {
-        printf("Cannot Open f22\n\r");
-    }
-printf("size of file pointer: %d\n\r",sizeof(f22));
-*/
 
 
     timer_open.reset();
     timer_open.start();
-    wavfile1 = fopen("/sd/mydir/SoundDecoder_second/09.wav","rb");
+    wavfile1 = fopen("/sd/mydir/SoundDecoder_second/All_eight_notches.wav","rb");
     if(wavfile1 == NULL) {
         printf("Cannot Open wavfile1\n\r");
     }
@@ -569,7 +454,7 @@
 
 printf("Size of wavfile 1: %d bytes\n\r",sizeof(wavfile1));
     timer_open.start();
-    wavfile2 = fopen("/sd/mydir/SoundDecoder_second/10.wav","rb");
+    wavfile2 = fopen("/sd/mydir/SoundDecoder_second/All_14_Notch_Transitions.wav","rb");
     if(wavfile2 == NULL) {
         printf("Cannot Open wavfile2\n\r");
     }
@@ -578,7 +463,7 @@
     timer_open.reset();
 
     timer_open.start();
-    wavfile3 = fopen("/sd/mydir/SoundDecoder_second/11.wav","rb");
+    wavfile3 = fopen("/sd/mydir/SoundDecoder_second/All_eight_notches.wav","rb");
     if(wavfile3 == NULL) {
         printf("Cannot Open wavfile3\n\r");
     }
@@ -590,160 +475,10 @@
     Sound1 = ReadFileInfo(Sound1,wavfile1);
     Sound2 = ReadFileInfo(Sound2,wavfile2);
     Sound3 = ReadFileInfo(Sound3,wavfile3);
-    
-    FILE* wavfile4 = fopen("/sd/mydir/SoundDecoder_second/12.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/13.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/14.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/15.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/16.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/17.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/18.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/19.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/20.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/21.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/22.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);
+    //fclose(wavfile2);
+    //fclose(wavfile3);
     NotchFadeIn.LengthSecs = 2;
     NotchFadeOut.LengthSecs = 2;
     NotchFadeIn = FadeDataInitialise(NotchFadeIn);