Diff: main.cpp

Revision:

35:4ba2f4fd7015

Parent:

34:422d4d6ae5ea

Child:

36:09c32b11d1a0

--- a/main.cpp	Tue Feb 17 06:28:32 2015 +0000
+++ b/main.cpp	Tue Feb 17 07:36:34 2015 +0000
@@ -6,19 +6,7 @@
 
 int main(void)
 {
-    /*
-    button_t array0[] = {R1, 0};
-    button_t array1[] = {CIRCLE, 0};
-
-    Producer* source0 = new RepeaterSource(array0, sizeof(array0)/sizeof(button_t));
-    Producer* source1 = new RepeaterSource(array1, sizeof(array1)/sizeof(button_t));
-    Producer* ss[] = {source0, source1};
-    Producer* source = new MergeFlow(ss, 2);
-    */
-
-
     note don1 = { Don, 1 };
-    note don075 = { Don, 0.75 };
     note don05 = { Don, 0.5 };
     note don025 = { Don, 0.25 };
     note un1 = { Un, 1 };
@@ -26,130 +14,17 @@
     note ka1 = { Ka, 1 };
     note ka05 = { Ka, 0.5 };
     note ka025 = { Ka, 0.25 };
-    note renda3 = { Renda, 3 };
     note renda2 = { Renda, 2 };
     note dondai05 = { DonDai, 0.5 };
     note dondai1 = { DonDai, 1 };
     note kadai05 = { KaDai, 0.5 };
     note kadai1 = { KaDai, 1 };
 
-    /*
-    // Radetzkymarsch perfect score
-    note* note_seq[] = {
-        &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &don1,
-        &don025, &don025, &don025, &don025, &don05, &don05, &don1, &un05, &don025, &don025,
-
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &don025, &don025,
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &un05,
-
-        &don05, &ka05, &ka05, &un05, &don05, &ka05, &ka05, &un05,
-        &don05, &ka05, &don05, &ka05, &don1, &un1,
-
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &don025, &don025,
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &un05,
-
-        &don05, &ka05, &ka05, &un05, &don05, &ka05, &ka05, &un05,
-        &don075, &don025, &don025, &don025, &don025, &don025, &don05, &don05, &don1,
-
-        &renda3, &un1,
-        &renda3, &un1,
-
-        &don1, &don075, &don025, &don1, &don1,
-        &ka05, &ka025, &ka025, &ka05, &don05, &ka05, &ka025, &ka025, &ka1,
-
-        &don1, &don075, &don025, &don1, &don1,
-        &ka05, &ka025, &ka025, &ka05, &don05, &ka05, &ka025, &ka025, &ka05, &don05,
-
-        &ka05, &ka025, &ka025, &ka05, &ka025, &ka025, &ka05, &ka025, &ka025, &ka05, &ka025, &ka025,
-        &ka1, &un1, &un1, &un05, &don025, &don025,
-
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &don025, &don025,
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &un05,
-
-        &don05, &ka05, &ka05, &un05, &don05, &ka05, &ka05, &un05,
-        &don05, &ka05, &don05, &ka05, &don1, &un1,
-
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &don025, &don025,
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &un05,
-
-        &don05, &ka05, &ka05, &un05, &don05, &ka05, &ka05, &un05,
-        &don075, &don025, &don025, &don025, &don025, &don025, &don05, &don05, &don1,
-
-        // changing tempo?
-        &don1, &un05, &don05, &don05, &don05, &don05, &don05,
-        &don05, &ka025, &ka025, &ka05, &ka05, &ka1, &un1,
-
-        //
-        &don1, &ka1, &don05, &don05, &ka1,
-        &don1, &ka05, &ka05, &don1, &un1,
-
-        &don1, &ka05, &ka05, &don025, &don025, &don05, &ka1,
-        &don1, &ka05, &ka05, &don1, &un1,
-
-        &don1, &ka1, &don05, &don05, &ka1,
-        &don1, &ka05, &ka05, &don1, &un1,
-
-        &don1, &ka05, &ka05, &don025, &don025, &don05, &ka1,
-        &don025, &don025, &don05, &don025, &don025, &don05, &don1, &un1,
-
-        //
-        &don05, &don025, &don025, &don1, &ka05, &ka05, &ka05, &ka05,
-        &don05, &don025, &don025, &don1, &ka05, &ka05, &ka1,
-
-        &don05, &don025, &don025, &don1, &ka05, &ka05, &ka05, &ka05,
-        &don1, &un05, &don025, &don025, &don1, &un1,
-
-        &don1, &ka1, &don05, &don05, &ka1,
-        &don1, &ka05, &ka05, &don1, &un1,
-
-        &don1, &ka05, &ka05, &don025, &don025, &don05, &ka1,
-        &don025, &don025, &don05, &don025, &don025, &don05, &don1, &un1,
-
-        &don05, &don025, &don025, &don1, &ka05, &ka05, &ka05, &ka05,
-        &don05, &don025, &don025, &don1, &ka05, &ka05, &ka1,
-
-        &don05, &don025, &don025, &don1, &ka05, &ka05, &ka05, &ka05,
-        &don1, &un05, &don025, &don025, &don1, &un1,
-
-        &don025, &don025, &don025, &don025, &don05, &ka05, &don025, &don025, &don025, &don025, &don05, &ka05,
-        &don025, &don025, &don025, &don025, &don05, &ka05, &ka1, &un1,
-
-        &don025, &don025, &don025, &don025, &don1, &don025, &don025, &don025, &don025, &don1,
-        &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &don1,
-
-        //
-        &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &don1,
-        &don025, &don025, &don025, &don025, &don05, &don05, &don1, &un05, &don025, &don025,
-
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &don025, &don025,
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &un05,
-
-        &don05, &ka05, &ka05, &un05, &don05, &ka05, &ka05, &un05,
-        &don05, &ka05, &don05, &ka05, &don1, &un1,
-
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &don025, &don025,
-        &don05, &don025, &don025, &don05, &don025, &don025, &don05, &don05, &don05, &un05,
-
-        &don05, &ka05, &ka05, &un05, &don05, &ka05, &ka05, &un05,
-        &don075, &don025, &don025, &don025, &don025, &don025, &don05, &don05, &don1
-    };
-
-    Producer* source = new TaikoSource(note_seq, sizeof(note_seq)/sizeof(note*), 119.9);
-
-    */
-
-    button_t menu_bs[] = {
-        /*
-        START, START, START, START, START, START,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        LEFT, LEFT, LEFT, LEFT, LEFT, LEFT,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        */
+    button_t go_bs[] = {
         CIRCLE, CIRCLE,
     };
 
-    Producer* menu = new OnetimeSource(menu_bs, sizeof(menu_bs) / sizeof(button_t));
+    Producer* go = new OnetimeSource(go_bs, sizeof(go_bs) / sizeof(button_t));
 
     // Koibumi2000
     note* note_seq[] = {
@@ -303,10 +178,10 @@
 
     Producer* taiko = new TaikoSource(note_seq, sizeof(note_seq)/sizeof(note*), 200);
 
-    Producer* delayed = new DelayFlow(taiko, 9.0827); // 3.49
+    Producer* delayed = new DelayFlow(taiko, 9.068);
 
-    Producer* src_seq[] = { menu, delayed };
-    Producer* source = new SequentialFlow(src_seq, 2);
+    Producer* src_seq[] = { go, delayed };
+    Producer* source = new SequentialFlow(src_seq, sizeof(src_seq) / sizeof(src_seq[0]));
 
     FLL fll(source);
     fll.run();