Merge branch 'currentPitch' of https://github.com/sksum/musicblocks i…

…nto sksum-currentPitch
sugarlabs · Aug 29, 2020 · e49bef6 · e49bef6
2 parents e8f50d3 + 8e922e9
commit e49bef6
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/js/logo.js b/js/logo.js
@@ -170,6 +170,7 @@ class Logo {
 
         this.temperamentSelected = [];
         this.customTemperamentDefined = false;
+        this.specialArgs = [];
 
         if (_THIS_IS_MUSIC_BLOCKS_) {
             // Load the default synthesizer
@@ -1522,6 +1523,10 @@ class Logo {
                         )
                     );
                 }
+                if (logo.turtles.ithTurtle(turtle).singer.inNoteBlock.length > 0 && 
+                    ["pitchinhertz","currentpitch"].indexOf(logo.blocks.blockList[logo.blocks.blockList[blk].connections[i]].name) !== -1) {
+                    logo.specialArgs.push([args, logo, turtle, blk, receivedArg, null, isflow]);  //redo after noteBlock Ends
+                }
             }
         }
 

diff --git a/js/turtle-singer.js b/js/turtle-singer.js
@@ -2066,6 +2066,47 @@ class Singer {
 
             if (last(tur.singer.inNoteBlock) !== null) {
                 __playnote();
+
+                if (logo.specialArgs.length > 0) {
+                    let runAgainBlockParam = logo.specialArgs.pop()
+                    let _ar = runAgainBlockParam
+                    let blockN = _ar[3];
+
+                    //update args for pitch in hertz and current pitch and then redo the flow block they are attatched to(print/storein etc).
+
+                    let args = [];
+                    for (let i = 1; i <= logo.blocks.blockList[blockN].protoblock.args; i++) {
+                        if (logo.blocks.blockList[blockN].protoblock.dockTypes[i] === "in") {
+                            if (logo.blocks.blockList[blockN].connections[i] == null) {
+                                console.debug("skipping inflow args");
+                            } else {
+                                args.push(logo.blocks.blockList[blockN].connections[i]);
+                            }
+                        } else {
+                            args.push(
+                                logo.parseArg(
+                                    logo,
+                                    _ar[2],
+                                    logo.blocks.blockList[blockN].connections[i],
+                                    blockN,
+                                    _ar[4]
+                                )
+                            );
+                        }
+                    }
+                    //args, logo, turtle, blk, receivedArg, null, isflow
+                    if (typeof logo.blocks.blockList[blockN].protoblock.flow === "function") {
+                        logo.blocks.blockList[blockN].protoblock.flow(
+                            args,
+                            _ar[1],
+                            _ar[2],
+                            _ar[3],
+                            _ar[4],
+                            _ar[5],
+                            _ar[6]
+                        );
+                    }
+                }
             }
         }