Diff: NotchingDemo.cpp

Revision:

89:936f37f90cc2

Parent:

88:76a4563ee9c7

--- a/NotchingDemo.cpp	Wed Oct 02 20:37:50 2019 +0000
+++ b/NotchingDemo.cpp	Thu Oct 03 16:16:10 2019 +0000
@@ -101,7 +101,106 @@
 classFade   NotchFadeOut;
 classFade   NotchFadeIn;
 
+class classPositionIndicators
+{
+public:
+    int notch1_indicator, notch2_indicator, notch3_indicator, notch4_indicator;
+    int notch5_indicator, notch6_indicator, notch7_indicator, notch8_indicator;
+    int notch1_start_pt, notch2_start_pt, notch3_start_pt, notch4_start_pt;
+    int notch5_start_pt, notch6_start_pt, notch7_start_pt, notch8_start_pt;
+    int N1N2_start_pt, N2N3_start_pt, N3N4_start_pt, N4N5_start_pt, N5N6_start_pt;
+    int N6N7_start_pt, N7N8_start_pt, N8N7_start_pt, N7N6_start_pt, N6N5_start_pt;
+    int N5N4_start_pt, N4N3_start_pt, N3N2_start_pt, N2N1_start_pt;
 
+    int notch_start_pts [9];
+    int notch_position_indicators[9];
+    int notch_transitions_start_pts[15];
+    int notch_transitions_position_indicators[15];
+    int auxiliary_start_pts[5];
+    int auxiliary_position_indicators[5];
+    classPositionIndicators()
+    {
+        notch1_start_pt = 44;
+        notch2_start_pt = 220884+44;
+        notch3_start_pt = notch2_start_pt+217698;
+        notch4_start_pt = notch3_start_pt + 193060;
+        notch5_start_pt = notch4_start_pt + 92010;
+        notch6_start_pt = notch5_start_pt + 216642;
+        notch7_start_pt = notch6_start_pt + 250316;
+        notch8_start_pt = notch7_start_pt + 150152;
+        notch1_indicator = notch1_start_pt;
+        notch2_indicator = notch2_start_pt;
+        notch3_indicator = notch3_start_pt;
+        notch4_indicator = notch4_start_pt;
+        notch5_indicator = notch5_start_pt;
+        notch6_indicator = notch6_start_pt;
+        notch7_indicator = notch7_start_pt;
+        notch8_indicator = notch8_start_pt;
+        notch_start_pts[1] = notch1_start_pt;
+        notch_start_pts[2] = notch2_start_pt;
+        notch_start_pts[3] = notch3_start_pt;
+        notch_start_pts[4] = notch4_start_pt;
+        notch_start_pts[5] = notch5_start_pt;
+        notch_start_pts[6] = notch6_start_pt;
+        notch_start_pts[7] = notch7_start_pt;
+        notch_start_pts[8] = notch8_start_pt;
+        notch_position_indicators[1] = notch1_indicator;
+        notch_position_indicators[2] = notch2_indicator;
+        notch_position_indicators[3] = notch3_indicator;
+        notch_position_indicators[4] = notch4_indicator;
+        notch_position_indicators[5] = notch5_indicator;
+        notch_position_indicators[6] = notch6_indicator;
+        notch_position_indicators[7] = notch7_indicator;
+        notch_position_indicators[8] = notch8_indicator;
+
+        N1N2_start_pt = 44;
+        N2N3_start_pt = N1N2_start_pt + 73220;
+        N3N4_start_pt = N2N3_start_pt + 78164;
+        N4N5_start_pt = N3N4_start_pt + 59432;
+        N5N6_start_pt = N4N5_start_pt + 64984;
+        N6N7_start_pt = N5N6_start_pt + 59924;
+        N7N8_start_pt = N6N7_start_pt + 97874;
+        N8N7_start_pt = N7N8_start_pt + 63992;
+        N7N6_start_pt = N8N7_start_pt + 44506;
+        N6N5_start_pt = N7N6_start_pt + 55052;
+        N5N4_start_pt = N6N5_start_pt + 37038;
+        N4N3_start_pt = N5N4_start_pt + 49692;
+        N3N2_start_pt = N4N3_start_pt + 44100;
+        N2N1_start_pt = N3N2_start_pt + 58346;
+
+
+        notch_transitions_start_pts[1] = N1N2_start_pt;
+        notch_transitions_start_pts[2] = N2N3_start_pt;
+        notch_transitions_start_pts[3] = N3N4_start_pt;
+        notch_transitions_start_pts[4] = N4N5_start_pt;
+        notch_transitions_start_pts[5] = N5N6_start_pt;
+        notch_transitions_start_pts[6] = N6N7_start_pt;
+        notch_transitions_start_pts[7] = N7N8_start_pt;
+        notch_transitions_start_pts[8] = N8N7_start_pt;
+        notch_transitions_start_pts[9] = N7N6_start_pt;
+        notch_transitions_start_pts[10] = N6N5_start_pt;
+        notch_transitions_start_pts[11] = N5N4_start_pt;
+        notch_transitions_start_pts[12] = N4N3_start_pt;
+        notch_transitions_start_pts[13] = N3N2_start_pt;
+        notch_transitions_start_pts[14] = N2N1_start_pt;
+
+
+        notch_transitions_position_indicators[1] = N1N2_start_pt;
+        notch_transitions_position_indicators[2] = N2N3_start_pt;
+        notch_transitions_position_indicators[3] = N3N4_start_pt;
+        notch_transitions_position_indicators[4] = N4N5_start_pt;
+        notch_transitions_position_indicators[5] = N5N6_start_pt;
+        notch_transitions_position_indicators[6] = N6N7_start_pt;
+        notch_transitions_position_indicators[7] = N7N8_start_pt;
+        notch_transitions_position_indicators[8] = N8N7_start_pt;
+        notch_transitions_position_indicators[9] = N7N6_start_pt;
+        notch_transitions_position_indicators[10] = N6N5_start_pt;
+        notch_transitions_position_indicators[11] = N5N4_start_pt;
+        notch_transitions_position_indicators[12] = N4N3_start_pt;
+        notch_transitions_position_indicators[13] = N3N2_start_pt;
+        notch_transitions_position_indicators[14] = N2N1_start_pt;
+    }
+};
 
 
 
@@ -408,7 +507,7 @@
 
 
 
-void Play_WaveFileLoop(classSoundFile Sound1, classSoundFile Sound2, classSoundFile Sound3, FILE* wavfile1,FILE* wavfile2, FILE* wavfile3);
+void Play_WaveFileLoop(classSoundFile Sound1, classSoundFile Sound2, classSoundFile Sound3, FILE* wavfile1,FILE* wavfile2, FILE* wavfile3, classPositionIndicators Positions);
 int main()
 {
 
@@ -491,8 +590,10 @@
 
 //timer_interrupt.reset();
 
+    classPositionIndicators Positions;
+
     printf("about to play wav file\n\r");
-    Play_WaveFileLoop(Sound1,Sound2,Sound3,wavfile1,wavfile2,wavfile3);
+    Play_WaveFileLoop(Sound1,Sound2,Sound3,wavfile1,wavfile2,wavfile3,Positions);
     //Play_WaveFileDual(StartupWav,WavInfo_Startup);
     printf("finished playing Wav file\n\r");
 
@@ -708,7 +809,7 @@
 
 
 
-void Play_WaveFileLoop(classSoundFile Sound1, classSoundFile Sound2, classSoundFile Sound3, FILE *wavfile1, FILE *wavfile2, FILE *wavfile3)
+void Play_WaveFileLoop(classSoundFile Sound1, classSoundFile Sound2, classSoundFile Sound3, FILE *wavfile1, FILE *wavfile2, FILE *wavfile3, classPositionIndicators Positions)
 {
     while(1) { //might have to change this to a while(1) loop?
         //New format!!  This should be (roughly) the way that this is done, with the new structures and classes