Diff: main.cpp

Revision:

6:d0348b7a2f05

Parent:

5:130721ce29f7

Child:

7:61b4825304e2

Child:

29:2f3d6d09eaac

--- a/main.cpp	Sat Feb 14 07:25:27 2015 +0000
+++ b/main.cpp	Sat Feb 14 08:02:21 2015 +0000
@@ -4,9 +4,9 @@
 
 #define FRAME 1.0 / 60 // 1 frame (sec)
 
-class OrPipe : public Pipe {
+class OrFoldFlow : public FoldFlow {
     public:
-    OrPipe(Source **srcs, int srcs_size) : Pipe(srcs, srcs_size) {}
+    OrFoldFlow(Producer **srcs, int srcs_size) : FoldFlow(srcs, srcs_size) {}
     virtual button_t fold(button_t *bs, int bs_size) {
         button_t b = 0x00;
         for(int i = 0; i < bs_size; i++) {
@@ -29,10 +29,10 @@
     button_t array0[] = {R1, 0};
     button_t array1[] = {B_CIRCLE, 0};
     // user must make Source
-    Source* source0 = new Source(array0, sizeof(array0)/sizeof(button_t), true);
-    Source* source1 = new Source(array1, sizeof(array1)/sizeof(button_t), true);
-    Source* ss[] = {source0, source1};
-    Source* source = new OrPipe(ss, 2);
+    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 OrFoldFlow(ss, 2);
 
     // common pattern
     Mail<button_t, MAIL_BOX_SIZE>* mail_box = new Mail<button_t, MAIL_BOX_SIZE>();