pxt-common-packages 10.3.8 → 10.3.9

package/libs/game/textDialogs.ts

@@ -14,6 +14,22 @@ enum DialogLayout {
 }
 
 namespace game {
+    function padStr(len: number): string {
+        let str = "";
+        for (let i = 0; i < len; ++i) {
+            str += " ";
+        }
+        return str;
+    }
+
+    function replaceRange(dst: string, src: string, start: number, len: number): string {
+        return dst.substr(0, start) + src.substr(0, len) + dst.substr(start + len);
+    }
+
+    function screenColor(c: number): number {
+        return screen.isMono ? 1 : c;
+    }
+
     let dialogFrame: Image;
     let dialogCursor: Image;
     let dialogTextColor: number;
@@ -36,24 +52,21 @@ namespace game {
         textColor: number;
 
         constructor(width: number, height: number, frame?: Image, font?: image.Font, cursor?: Image) {
-            this.image = image.create(width, height);
+            this.cursorCount = 0;
+            this.resize(width, height, frame, font, cursor);
+        }
 
+        resize(width: number, height: number, frame?: Image, font?: image.Font, cursor?: Image) {
             this.frame = frame || dialogFrame || (dialogFrame = defaultFrame());
-
-            this.font = font || image.font8;
-
-            this.cursor = cursor || dialogCursor || (dialogCursor = defaultCursorImage());
-
-            this.textColor = dialogTextColor == undefined ? dialogTextColor = 15 : dialogTextColor;
-
             this.unit = Math.floor(this.frame.width / 3);
             this.columns = Math.floor(width / this.unit);
             this.rows = Math.floor(height / this.unit);
-
             this.innerLeft = (width - (this.columns * this.unit)) >> 1;
             this.innerTop = (height - (this.rows * this.unit)) >> 1;
-
-            this.cursorCount = 0;
+            this.image = image.create(width, height);
+            this.font = font || image.font8;
+            this.cursor = cursor || dialogCursor || (dialogCursor = defaultCursorImage());
+            this.textColor = dialogTextColor == undefined ? dialogTextColor = 15 : dialogTextColor;
 
             this.drawBorder();
             this.clearInterior();
@@ -332,18 +345,150 @@ namespace game {
         }
     }
 
+    const img_trophy_sm = img`
+    . . . . . . . 
+    . 4 5 5 5 1 . 
+    . 4 5 5 5 1 . 
+    . 4 5 5 5 1 . 
+    . . 4 5 1 . . 
+    . . . 5 . . . 
+    . . 4 5 1 . . 
+    . . . . . . . 
+    `;
+
+    const img_trophy_lg = img`
+    . . . . . . . . . . . . . . . . 
+    . . . . . . . . . . . . . . . . 
+    . . . . . 5 5 5 5 5 5 . . . . . 
+    . . . . 5 4 4 4 4 4 4 5 . . . . 
+    . . . . 5 5 5 5 5 5 5 5 . . . . 
+    . . . . 4 5 5 5 5 5 5 1 . . . . 
+    . . . 5 4 4 5 5 5 5 1 1 5 . . . 
+    . . 5 . 4 4 5 5 5 5 1 1 . 5 . . 
+    . . 5 . 4 4 5 5 5 5 1 1 . 5 . . 
+    . . . 5 4 4 5 5 5 5 1 1 5 . . . 
+    . . . . 4 4 5 5 5 5 1 1 . . . . 
+    . . . . . 4 5 5 5 1 1 . . . . . 
+    . . . . . . 4 5 1 1 . . . . . . 
+    . . . . . . . 4 1 . . . . . . . 
+    . . . . . 4 4 5 5 1 1 . . . . . 
+    . . . . . . . . . . . . . . . . 
+    `;
+
+    const img_sleepy_sim = img`
+    . . . . . . . . . . . . . . . . 
+    . . . 6 6 6 6 6 6 6 6 6 6 . . . 
+    . . 6 f f f f f f f f f f 6 . . 
+    . . 6 f f f f f f f f f f 6 . . 
+    . . 6 f f 1 1 f f 1 1 f f 6 . . 
+    . . 6 f f f f f f f f f f 6 . . 
+    . . 6 f f f f 1 1 f f f f 6 . . 
+    . . 6 f f f f f f f f f f 6 . . 
+    . . 6 6 6 6 6 6 6 6 6 6 6 6 . . 
+    . . 6 6 f 6 6 6 6 6 6 6 f 6 . . 
+    . . 6 f f f 6 6 6 6 6 6 6 6 . . 
+    . . 6 6 f 6 6 6 6 6 f 6 6 6 . . 
+    . . 6 6 6 6 6 6 6 6 6 6 6 6 . . 
+    . . . 6 6 6 6 6 6 6 6 6 6 . . . 
+    . . . . . . . . . . . . . . . . 
+    . . . . . . . . . . . . . . . . 
+    `;
+
+    export class GameOverPlayerScore {
+        public str: string;
+        constructor(
+            public player: number,
+            public value: number,
+            public winner: boolean) { }
+    }
+
+    enum GameOverDialogFlags {
+        WIN = 1,
+        HAS_BEST = 2,
+        NEW_BEST = 4,
+        MULTIPLAYER = 8,
+        HAS_SCORES = 16
+    };
+
     export class GameOverDialog extends game.BaseDialog {
         protected cursorOn: boolean;
-        protected isNewHighScore: boolean;
+        protected flags: GameOverDialogFlags;
+        protected height: number;
+
+        get isWinCondition() { return !!(this.flags & GameOverDialogFlags.WIN); }
+        get isJudgedGame() { return this.judged; }
+        get hasScores() { return !!(this.flags & GameOverDialogFlags.HAS_SCORES); }
+        get hasBestScore() { return !!(this.flags & GameOverDialogFlags.HAS_BEST); }
+        get isNewBestScore() { return !!(this.flags & GameOverDialogFlags.NEW_BEST); }
+        get isMultiplayerGame() { return !!(this.flags & GameOverDialogFlags.MULTIPLAYER); }
 
         constructor(
-            protected win: boolean,
-            protected score?: number,
-            protected highScore?: number
+            win: boolean,
+            protected message: string,
+            protected judged: boolean,
+            protected scores: GameOverPlayerScore[],
+            protected bestScore?: number,
+            protected winnerOverride?: number
         ) {
             super(screen.width, 46, defaultSplashFrame());
             this.cursorOn = false;
-            this.isNewHighScore = this.score > this.highScore;
+            this.flags = 0;
+
+            if (win) {
+                this.flags |= GameOverDialogFlags.WIN;
+            }
+
+            // Fixup states in case of winner override
+            if (winnerOverride) {
+                win = true;
+                this.flags |= GameOverDialogFlags.WIN;
+                // For display purposes, treat this as a multiplayer game
+                this.flags |= GameOverDialogFlags.MULTIPLAYER;
+                const score = scores.find(score => score.player === winnerOverride);
+                if (!score) {
+                    scores.push(new GameOverPlayerScore(winnerOverride, null, true));
+                    scores.sort((a, b) => a.player - b.player);
+                }
+                scores.forEach(score => score.winner = score.player === winnerOverride);
+            }
+
+            if (scores.length) {
+                // If any score present is other than player 1, this is a multiplayer game
+                scores.forEach(score => score.player > 1 && (this.flags |= GameOverDialogFlags.MULTIPLAYER));
+                if (win) {
+                    let winner = scores.find(score => score.winner);
+                    if (!winner && scores.length === 1) winner = scores[0];
+                    if (winner) {
+                        if (winner.value != null) {
+                            if (bestScore == null) {
+                                this.bestScore = winner.value;
+                                this.flags |= GameOverDialogFlags.NEW_BEST;
+                            } else if (info.isBetterScore(winner.value, bestScore)) {
+                                this.bestScore = winner.value;
+                                this.flags |= GameOverDialogFlags.NEW_BEST;
+                            }
+                        }
+                        // Replace string tokens with resolved values
+                        this.message = this.message
+                            .replaceAll("${WINNER}", "PLAYER " + winner.player)
+                            .replaceAll("${Winner}", "Player " + winner.player)
+                            .replaceAll("${winner}", "player " + winner.player)
+                            .replaceAll("${winner_short}", "P" + winner.player);
+                    }
+                }
+            }
+
+            const scoresWithValues = scores.filter(score => score.value != null);
+            if (scoresWithValues.length) this.flags |= GameOverDialogFlags.HAS_SCORES;
+
+            if (this.isWinCondition && this.isJudgedGame && this.hasScores && (this.bestScore != null)) {
+                this.flags |= GameOverDialogFlags.HAS_BEST;
+            }
+
+            // Two scores per row
+            const scoreRows = Math.max(0, scoresWithValues.length - 1) >> 1;
+            this.height = 47 + scoreRows * image.font5.charHeight;
+            this.resize(screen.width, this.height, defaultSplashFrame());
         }
 
         displayCursor() {
@@ -359,44 +504,134 @@ namespace game {
             }
         }
 
-        drawTextCore() {
-            const titleHeight = 8;
+        drawMessage() {
+            const currY = 5;
             this.image.printCenter(
-                this.win ? "YOU WIN!" : "GAME OVER!",
-                titleHeight,
-                screen.isMono ? 1 : 5,
+                this.message,
+                currY,
+                screenColor(5),
                 image.font8
             );
+        }
 
-            if (this.score !== undefined) {
-                const scoreHeight = 23;
-                const highScoreHeight = 34;
-                const scoreColor = screen.isMono ? 1 : 2;
-
-                this.image.printCenter(
-                    "Score:" + this.score,
-                    scoreHeight,
-                    scoreColor,
-                    image.font8
-                );
+        drawScores() {
+            if (this.hasScores) {
+                const scores = this.scores.filter(score => score.value != null);
+                let currY = image.font5.charHeight + 16;
+                if (this.isMultiplayerGame) {
+                    if (scores.length === 1) {
+                        // Multiplayer special case: Only one player scored
+                        const score = scores[0];
+                        score.str = "P" + score.player + ":" + score.value;
+                        this.image.printCenter(
+                            score.str,
+                            currY,
+                            screenColor(1),
+                            image.font5
+                        );
+                        if (score.winner) {
+                            // In multiplayer, the winning score gets a trophy
+                            const x = (this.image.width >> 1) - ((score.str.length * image.font5.charWidth) >> 1);
+                            this.image.drawTransparentImage(img_trophy_sm, x - img_trophy_sm.width - 3, currY - 2);
+                        }
+                    } else {
+                        // Multiplayer general case: Multiple players scored
+                        // Compute max score width
+                        const strlens = [0, 0];
+                        for (let i = 0; i < scores.length; ++i) {
+                            const col = i % 2;
+                            const score = scores[i];
+                            score.str = "P" + score.player + ":" + score.value;
+                            strlens[col] = Math.max(strlens[col], score.str.length);
+                        }
+                        // Print scores in a grid, two per row
+                        for (let i = 0; i < scores.length; ++i) {
+                            const col = i % 2;
+                            const score = scores[i];
+                            let str = padStr(strlens[col]);
+                            str = replaceRange(str, score.str, 0, score.str.length);
+                            let x = 0;
+                            if (col === 0) {
+                                x = (this.image.width >> 1) - strlens[col] * image.font5.charWidth - 3;
+                            } else {
+                                x = (this.image.width >> 1) + 3;
+                            }
+                            if (score.winner) {
+                                // In multiplayer, the winning score gets a trophy
+                                if (i % 2 === 0) {
+                                    this.image.drawTransparentImage(img_trophy_sm, x - img_trophy_sm.width - 3, currY - 2);
+                                } else {
+                                    this.image.drawTransparentImage(img_trophy_sm, x + score.str.length * image.font5.charWidth + 2, currY - 2);
+                                }
+                            }
+                            this.image.print(
+                                str,
+                                x,
+                                currY,
+                                screenColor(1),
+                                image.font5
+                            );
+                            if (i % 2 === 1) {
+                                currY += image.font5.charHeight + 2;
+                            }
+                        }
+                    }
+                } else {
+                    // Single player case
+                    const score = scores[0];
+                    score.str = "Score:" + score.value;
+                    this.image.printCenter(
+                        score.str,
+                        currY - 1,
+                        screenColor(1),
+                        image.font8 // Single player score gets a bigger font
+                    );
+                }
+            } else if (this.isWinCondition) {
+                // No score, but there is a win condition. Show a trophy.
+                let currY = image.font5.charHeight + 14;
+                this.image.drawTransparentImage(img_trophy_lg, (this.image.width >> 1) - (img_trophy_lg.width >> 1), currY);
+            } else {
+                // No score, no win, show a generic game over icon (sleepy sim)
+                let currY = image.font5.charHeight + 14;
+                this.image.drawTransparentImage(img_sleepy_sim, (this.image.width >> 1) - (img_sleepy_sim.width >> 1), currY);
+            }
+        }
 
-                if (this.isNewHighScore) {
+        drawBestScore() {
+            if (this.hasBestScore) {
+                const currY = this.height - image.font8.charHeight - 5;
+                if (this.isNewBestScore) {
+                    const label = "New Best Score!";
                     this.image.printCenter(
-                        "New High Score!",
-                        highScoreHeight,
-                        scoreColor,
-                        image.font5
+                        label,
+                        currY,
+                        screenColor(9),
+                        image.font8
                     );
+                    // In single player draw trophy icons on either side of the label.
+                    // In multiplayer a trophy icon is drawn next to the winning score instead.
+                    if (!this.isMultiplayerGame) {
+                        const halfWidth = (label.length * image.font8.charWidth) >> 1;
+                        this.image.drawTransparentImage(img_trophy_sm, (this.image.width >> 1) - halfWidth - img_trophy_sm.width - 2, currY);
+                        this.image.drawTransparentImage(img_trophy_sm, (this.image.width >> 1) + halfWidth, currY);
+                    }
                 } else {
                     this.image.printCenter(
-                        "HI" + this.highScore,
-                        highScoreHeight,
-                        scoreColor,
+                        "Best:" + this.bestScore,
+                        currY,
+                        screenColor(9),
                         image.font8
                     );
                 }
             }
         }
+
+        drawTextCore() {
+            this.drawMessage();
+            this.drawScores();
+            this.drawBestScore();
+        }
     }
 
     /**

package/libs/lcd/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P48572(s) {
+function _main___P48685(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___48815 = (undefined);
-    globals._pollEventQueue___48828 = (undefined);
+    globals._intervals___48928 = (undefined);
+    globals._pollEventQueue___48941 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48572.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48572.continuations = [  ]
+_main___P48685.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48685.continuations = [  ]
 
-function _main___P48572_mk(s) {
+function _main___P48685_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48572, depth: s.depth + 1,
+        parent: s, fn: _main___P48685, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48572_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48572
+return _main___P48685
 })

package/libs/light-spectrum-sensor/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P98048(s) {
+function _main___P98387(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___98291 = (undefined);
-    globals._pollEventQueue___98304 = (undefined);
+    globals._intervals___98630 = (undefined);
+    globals._pollEventQueue___98643 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P98048.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P98048.continuations = [  ]
+_main___P98387.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P98387.continuations = [  ]
 
-function _main___P98048_mk(s) {
+function _main___P98387_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P98048, depth: s.depth + 1,
+        parent: s, fn: _main___P98387, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P98048_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P98048
+return _main___P98387
 })

package/libs/lora/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P59874(s) {
+function _main___P59987(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___60117 = (undefined);
-    globals._pollEventQueue___60130 = (undefined);
+    globals._intervals___60230 = (undefined);
+    globals._pollEventQueue___60243 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P59874.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P59874.continuations = [  ]
+_main___P59987.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P59987.continuations = [  ]
 
-function _main___P59874_mk(s) {
+function _main___P59987_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P59874, depth: s.depth + 1,
+        parent: s, fn: _main___P59987, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P59874_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P59874
+return _main___P59987
 })

package/libs/matrix-keypad/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P190524(s) {
+function _main___P191315(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___190767 = (undefined);
-    globals._pollEventQueue___190780 = (undefined);
+    globals._intervals___191558 = (undefined);
+    globals._pollEventQueue___191571 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P190524.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P190524.continuations = [  ]
+_main___P191315.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P191315.continuations = [  ]
 
-function _main___P190524_mk(s) {
+function _main___P191315_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P190524, depth: s.depth + 1,
+        parent: s, fn: _main___P191315, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P190524_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P190524
+return _main___P191315
 })

package/libs/mixer/instrument.ts

@@ -1,6 +1,8 @@
 namespace music.sequencer {
     const BUFFER_SIZE = 12;
 
+    let currentSequencer: sequencer.Sequencer;
+
     /**
      * Byte encoding format for songs
      * FIXME: should this all be word aligned?
@@ -66,10 +68,11 @@ namespace music.sequencer {
      *          2 = sharp
      */
 
-    export class Song {
+    export class Song extends Playable {
         tracks: Track[];
 
         constructor(public buf: Buffer) {
+            super();
             this.tracks = [];
 
             let currentOffset = 7;
@@ -128,6 +131,22 @@ namespace music.sequencer {
         get numberOfTracks(): number {
             return this.buf[6];
         }
+
+        play(playbackMode: PlaybackMode) {
+            if (currentSequencer) currentSequencer.stop();
+            currentSequencer = new sequencer.Sequencer(this);
+
+            if (playbackMode === PlaybackMode.UntilDone) {
+                currentSequencer.start(false);
+                pause(this.measures * this.beatsPerMeasure * this.beatsPerMinute * 60 * 1000)
+            }
+            else if (playbackMode === PlaybackMode.InBackground) {
+                currentSequencer.start(false);
+            }
+            else {
+                currentSequencer.start(true);
+            }
+        }
     }
 
     export class Envelope {

package/libs/mixer/melody.ts

@@ -81,6 +81,7 @@ namespace music {
     //% blockNamespace=music
     //% weight=76 blockGap=8
     //% group="Tone"
+    //% deprecated=1
     export function playTone(frequency: number, ms: number): void {
         if (ms == 0)
             ms = 86400000 // 1 day
@@ -123,6 +124,7 @@ namespace music {
     //% melody.shadow="melody_editor"
     //% tempo.min=40 tempo.max=500
     //% tempo.defl=120
+    //% deprecated=1
     export function playMelody(melody: string, tempo: number) {
         let notes: string[] = melody.split(" ").filter(n => !!n);
         let formattedMelody = "";
@@ -181,6 +183,7 @@ namespace music {
     export function stopAllSounds() {
         Melody.stopAll();
         stopPlaying();
+        _stopPlayables();
     }
 
     //% fixedInstances
@@ -213,6 +216,7 @@ namespace music {
         //% parts="headphone"
         //% weight=92 blockGap=8
         //% group="Sounds"
+        //% deprecated=1
         stop() {
             if (this._player) {
                 this._player.stop()
@@ -270,6 +274,7 @@ namespace music {
         //% parts="headphone"
         //% weight=93 blockGap=8
         //% group="Sounds"
+        //% deprecated=1
         loop(volume = 255) {
             this.playCore(volume, true)
         }
@@ -283,6 +288,7 @@ namespace music {
         //% parts="headphone"
         //% weight=95 blockGap=8
         //% group="Sounds"
+        //% deprecated=1
         play(volume = 255) {
             this.playCore(volume, false)
         }
@@ -297,6 +303,7 @@ namespace music {
         //% parts="headphone"
         //% weight=94 blockGap=8
         //% group="Sounds"
+        //% deprecated=1
         playUntilDone(volume = 255) {
             this.stop()
             const p = this._player = new MelodyPlayer(this)
@@ -583,24 +590,15 @@ namespace music {
         }
     }
 
-    let currentSequencer: sequencer.Sequencer;
-
     //% shim=TD_ID
     //% blockId=music_song_field_editor
-    //% block="$song"
+    //% block="song $song"
     //% song.fieldEditor=musiceditor
-    export function _songFieldEditor(song: Buffer) {
-        return song;
-    }
-
-    //% blockId=music_start_song
-    //% block="start song $song looping $loop"
-    //% song.shadow=music_song_field_editor
-    export function startSong(song: Buffer, loop: boolean) {
-        if (currentSequencer) currentSequencer.stop();
-
-        currentSequencer = new sequencer.Sequencer(new sequencer.Song(song));
-        currentSequencer.start(loop);
+    //% toolboxParent=music_playable_play
+    //% toolboxParentArgument=toPlay
+    //% group="Songs"
+    export function createSong(song: Buffer): Playable {
+        return new sequencer.Song(song);
     }
 
     export function playInstructions(when: number, instructions: Buffer) {