pxt-core 8.5.9 → 8.5.10

package/built/pxt.js

@@ -111692,7 +111692,7 @@ var pxt;
              *     notes byte length
              *     ...note events
              *
-             * instrument(27 bytes)
+             * instrument(28 bytes)
              *     0 waveform
              *     1 amp attack
              *     3 amp decay
@@ -111708,6 +111708,7 @@ var pxt;
              *     22 amp lfo amp
              *     24 pitch lfo freq
              *     25 pitch lfo amp
+             *     27 octave
              *
              * drum(5 + 7 * steps bytes)
              *     0 steps
@@ -111727,6 +111728,12 @@ var pxt;
              *     4 polyphony
              *     5...notes(1 byte each)
              *
+             * note (1 byte)
+             *     lower six bits = note - (instrumentOctave - 2) * 12
+             *     upper two bits are the enharmonic spelling:
+             *          0 = normal
+             *          1 = flat
+             *          2 = sharp
              */
             function encodeSong(song) {
                 const encodedTracks = song.tracks
@@ -111781,6 +111788,7 @@ var pxt;
                 set16BitNumber(out, 22, ((_g = instrument.ampLFO) === null || _g === void 0 ? void 0 : _g.amplitude) || 0);
                 out[24] = ((_h = instrument.pitchLFO) === null || _h === void 0 ? void 0 : _h.frequency) || 0;
                 set16BitNumber(out, 25, ((_j = instrument.pitchLFO) === null || _j === void 0 ? void 0 : _j.amplitude) || 0);
+                out[27] = instrument.octave;
                 return out;
             }
             function decodeInstrument(buf, offset) {
@@ -111807,7 +111815,8 @@ var pxt;
                     pitchLFO: {
                         frequency: buf[offset + 24],
                         amplitude: get16BitNumber(buf, 25)
-                    }
+                    },
+                    octave: buf[offset + 27]
                 };
             }
             function decodeTrack(buf, offset) {
@@ -111847,27 +111856,54 @@ var pxt;
                 }
                 return res;
             }
-            function encodeNoteEvent(event) {
+            function encodeNoteEvent(event, instrumentOctave, isDrumTrack) {
                 const out = new Uint8Array(5 + event.notes.length);
                 set16BitNumber(out, 0, event.startTick);
                 set16BitNumber(out, 2, event.endTick);
                 out[4] = event.notes.length;
                 for (let i = 0; i < event.notes.length; i++) {
-                    out[5 + i] = event.notes[i];
+                    out[5 + i] = encodeNote(event.notes[i], instrumentOctave, isDrumTrack);
                 }
                 return out;
             }
-            function decodeNoteEvent(buf, offset) {
+            function decodeNoteEvent(buf, offset, instrumentOctave, isDrumTrack) {
                 const res = {
                     startTick: get16BitNumber(buf, offset),
                     endTick: get16BitNumber(buf, offset + 2),
                     notes: []
                 };
                 for (let i = 0; i < buf[offset + 4]; i++) {
-                    res.notes.push(buf[offset + 5 + i]);
+                    res.notes.push(decodeNote(buf[offset + 5 + i], instrumentOctave, isDrumTrack));
                 }
                 return res;
             }
+            function encodeNote(note, instrumentOctave, isDrumTrack) {
+                if (isDrumTrack) {
+                    return note.note;
+                }
+                let flags = 0;
+                if (note.enharmonicSpelling === "flat") {
+                    flags = 1;
+                }
+                else if (note.enharmonicSpelling === "sharp") {
+                    flags = 2;
+                }
+                return (note.note - (instrumentOctave - 2) * 12) | (flags << 6);
+            }
+            function decodeNote(note, instrumentOctave, isDrumTrack) {
+                const flags = note >> 6;
+                const result = {
+                    note: isDrumTrack ? note : ((note & 0x3f) + (instrumentOctave - 2) * 12),
+                    enharmonicSpelling: "normal"
+                };
+                if (flags === 1) {
+                    result.enharmonicSpelling = "flat";
+                }
+                else if (flags === 2) {
+                    result.enharmonicSpelling = "sharp";
+                }
+                return result;
+            }
             function encodeTrack(track) {
                 if (track.drums)
                     return encodeDrumTrack(track);
@@ -111875,7 +111911,7 @@ var pxt;
             }
             function encodeMelodicTrack(track) {
                 const encodedInstrument = encodeInstrument(track.instrument);
-                const encodedNotes = track.notes.map(encodeNoteEvent);
+                const encodedNotes = track.notes.map(note => encodeNoteEvent(note, track.instrument.octave, false));
                 const noteLength = encodedNotes.reduce((d, c) => c.length + d, 0);
                 const out = new Uint8Array(6 + encodedInstrument.length + noteLength);
                 out[0] = track.id;
@@ -111902,7 +111938,7 @@ var pxt;
                 const noteLength = get16BitNumber(buf, noteStart);
                 let currentOffset = noteStart + 2;
                 while (currentOffset < noteStart + 2 + noteLength) {
-                    res.notes.push(decodeNoteEvent(buf, currentOffset));
+                    res.notes.push(decodeNoteEvent(buf, currentOffset, res.instrument.octave, false));
                     currentOffset += 5 + res.notes[res.notes.length - 1].notes.length;
                 }
                 return [res, currentOffset];
@@ -111910,7 +111946,7 @@ var pxt;
             function encodeDrumTrack(track) {
                 const encodedDrums = track.drums.map(encodeDrumInstrument);
                 const drumLength = encodedDrums.reduce((d, c) => c.length + d, 0);
-                const encodedNotes = track.notes.map(encodeNoteEvent);
+                const encodedNotes = track.notes.map(note => encodeNoteEvent(note, 0, true));
                 const noteLength = encodedNotes.reduce((d, c) => c.length + d, 0);
                 const out = new Uint8Array(6 + drumLength + noteLength);
                 out[0] = track.id;
@@ -111945,7 +111981,7 @@ var pxt;
                 const noteLength = get16BitNumber(buf, currentOffset);
                 currentOffset += 2;
                 while (currentOffset < offset + 4 + drumByteLength + noteLength) {
-                    res.notes.push(decodeNoteEvent(buf, currentOffset));
+                    res.notes.push(decodeNoteEvent(buf, currentOffset, 0, true));
                     currentOffset += 5 + res.notes[res.notes.length - 1].notes.length;
                 }
                 return [res, currentOffset];
@@ -112012,6 +112048,27 @@ var pxt;
                     tracks: [
                         {
                             id: 0,
+                            name: lf("Dog"),
+                            notes: [],
+                            iconURI: "/static/music-editor/dog.png",
+                            instrument: {
+                                waveform: 1,
+                                octave: 4,
+                                ampEnvelope: {
+                                    attack: 10,
+                                    decay: 100,
+                                    sustain: 500,
+                                    release: 100,
+                                    amplitude: 1024
+                                },
+                                pitchLFO: {
+                                    frequency: 5,
+                                    amplitude: 0
+                                }
+                            }
+                        },
+                        {
+                            id: 1,
                             name: lf("Duck"),
                             notes: [],
                             iconURI: "/static/music-editor/duck.png",
@@ -112043,7 +112100,7 @@ var pxt;
                             }
                         },
                         {
-                            id: 1,
+                            id: 2,
                             name: lf("Cat"),
                             notes: [],
                             iconURI: "/static/music-editor/cat.png",
@@ -112070,27 +112127,6 @@ var pxt;
                                 }
                             }
                         },
-                        {
-                            id: 2,
-                            name: lf("Dog"),
-                            notes: [],
-                            iconURI: "/static/music-editor/dog.png",
-                            instrument: {
-                                waveform: 1,
-                                octave: 4,
-                                ampEnvelope: {
-                                    attack: 10,
-                                    decay: 100,
-                                    sustain: 500,
-                                    release: 100,
-                                    amplitude: 1024
-                                },
-                                pitchLFO: {
-                                    frequency: 5,
-                                    amplitude: 0
-                                }
-                            }
-                        },
                         {
                             id: 3,
                             name: lf("Fish"),

package/built/pxtblockly.js

@@ -17365,7 +17365,7 @@ var pxtblockly;
                 if (col > cellsShown)
                     break;
                 for (const note of noteEvent.notes) {
-                    const row = 12 - (note % 12);
+                    const row = 12 - (note.note % 12);
                     if (row > notesShown)
                         continue;
                     context.fillStyle = colors[trackColors[track.id || song.tracks.indexOf(track)]];

package/built/pxtblocks.js

@@ -13803,7 +13803,7 @@ var pxtblockly;
                 if (col > cellsShown)
                     break;
                 for (const note of noteEvent.notes) {
-                    const row = 12 - (note % 12);
+                    const row = 12 - (note.note % 12);
                     if (row > notesShown)
                         continue;
                     context.fillStyle = colors[trackColors[track.id || song.tracks.indexOf(track)]];

package/built/pxtlib.d.ts

@@ -1829,10 +1829,14 @@ declare namespace pxt.assets.music {
         notes: NoteEvent[];
     }
     interface NoteEvent {
-        notes: number[];
+        notes: Note[];
         startTick: number;
         endTick: number;
     }
+    interface Note {
+        note: number;
+        enharmonicSpelling: "normal" | "flat" | "sharp";
+    }
     interface DrumSoundStep {
         waveform: number;
         frequency: number;

package/built/pxtlib.js

@@ -14006,7 +14006,7 @@ var pxt;
              *     notes byte length
              *     ...note events
              *
-             * instrument(27 bytes)
+             * instrument(28 bytes)
              *     0 waveform
              *     1 amp attack
              *     3 amp decay
@@ -14022,6 +14022,7 @@ var pxt;
              *     22 amp lfo amp
              *     24 pitch lfo freq
              *     25 pitch lfo amp
+             *     27 octave
              *
              * drum(5 + 7 * steps bytes)
              *     0 steps
@@ -14041,6 +14042,12 @@ var pxt;
              *     4 polyphony
              *     5...notes(1 byte each)
              *
+             * note (1 byte)
+             *     lower six bits = note - (instrumentOctave - 2) * 12
+             *     upper two bits are the enharmonic spelling:
+             *          0 = normal
+             *          1 = flat
+             *          2 = sharp
              */
             function encodeSong(song) {
                 const encodedTracks = song.tracks
@@ -14095,6 +14102,7 @@ var pxt;
                 set16BitNumber(out, 22, ((_g = instrument.ampLFO) === null || _g === void 0 ? void 0 : _g.amplitude) || 0);
                 out[24] = ((_h = instrument.pitchLFO) === null || _h === void 0 ? void 0 : _h.frequency) || 0;
                 set16BitNumber(out, 25, ((_j = instrument.pitchLFO) === null || _j === void 0 ? void 0 : _j.amplitude) || 0);
+                out[27] = instrument.octave;
                 return out;
             }
             function decodeInstrument(buf, offset) {
@@ -14121,7 +14129,8 @@ var pxt;
                     pitchLFO: {
                         frequency: buf[offset + 24],
                         amplitude: get16BitNumber(buf, 25)
-                    }
+                    },
+                    octave: buf[offset + 27]
                 };
             }
             function decodeTrack(buf, offset) {
@@ -14161,27 +14170,54 @@ var pxt;
                 }
                 return res;
             }
-            function encodeNoteEvent(event) {
+            function encodeNoteEvent(event, instrumentOctave, isDrumTrack) {
                 const out = new Uint8Array(5 + event.notes.length);
                 set16BitNumber(out, 0, event.startTick);
                 set16BitNumber(out, 2, event.endTick);
                 out[4] = event.notes.length;
                 for (let i = 0; i < event.notes.length; i++) {
-                    out[5 + i] = event.notes[i];
+                    out[5 + i] = encodeNote(event.notes[i], instrumentOctave, isDrumTrack);
                 }
                 return out;
             }
-            function decodeNoteEvent(buf, offset) {
+            function decodeNoteEvent(buf, offset, instrumentOctave, isDrumTrack) {
                 const res = {
                     startTick: get16BitNumber(buf, offset),
                     endTick: get16BitNumber(buf, offset + 2),
                     notes: []
                 };
                 for (let i = 0; i < buf[offset + 4]; i++) {
-                    res.notes.push(buf[offset + 5 + i]);
+                    res.notes.push(decodeNote(buf[offset + 5 + i], instrumentOctave, isDrumTrack));
                 }
                 return res;
             }
+            function encodeNote(note, instrumentOctave, isDrumTrack) {
+                if (isDrumTrack) {
+                    return note.note;
+                }
+                let flags = 0;
+                if (note.enharmonicSpelling === "flat") {
+                    flags = 1;
+                }
+                else if (note.enharmonicSpelling === "sharp") {
+                    flags = 2;
+                }
+                return (note.note - (instrumentOctave - 2) * 12) | (flags << 6);
+            }
+            function decodeNote(note, instrumentOctave, isDrumTrack) {
+                const flags = note >> 6;
+                const result = {
+                    note: isDrumTrack ? note : ((note & 0x3f) + (instrumentOctave - 2) * 12),
+                    enharmonicSpelling: "normal"
+                };
+                if (flags === 1) {
+                    result.enharmonicSpelling = "flat";
+                }
+                else if (flags === 2) {
+                    result.enharmonicSpelling = "sharp";
+                }
+                return result;
+            }
             function encodeTrack(track) {
                 if (track.drums)
                     return encodeDrumTrack(track);
@@ -14189,7 +14225,7 @@ var pxt;
             }
             function encodeMelodicTrack(track) {
                 const encodedInstrument = encodeInstrument(track.instrument);
-                const encodedNotes = track.notes.map(encodeNoteEvent);
+                const encodedNotes = track.notes.map(note => encodeNoteEvent(note, track.instrument.octave, false));
                 const noteLength = encodedNotes.reduce((d, c) => c.length + d, 0);
                 const out = new Uint8Array(6 + encodedInstrument.length + noteLength);
                 out[0] = track.id;
@@ -14216,7 +14252,7 @@ var pxt;
                 const noteLength = get16BitNumber(buf, noteStart);
                 let currentOffset = noteStart + 2;
                 while (currentOffset < noteStart + 2 + noteLength) {
-                    res.notes.push(decodeNoteEvent(buf, currentOffset));
+                    res.notes.push(decodeNoteEvent(buf, currentOffset, res.instrument.octave, false));
                     currentOffset += 5 + res.notes[res.notes.length - 1].notes.length;
                 }
                 return [res, currentOffset];
@@ -14224,7 +14260,7 @@ var pxt;
             function encodeDrumTrack(track) {
                 const encodedDrums = track.drums.map(encodeDrumInstrument);
                 const drumLength = encodedDrums.reduce((d, c) => c.length + d, 0);
-                const encodedNotes = track.notes.map(encodeNoteEvent);
+                const encodedNotes = track.notes.map(note => encodeNoteEvent(note, 0, true));
                 const noteLength = encodedNotes.reduce((d, c) => c.length + d, 0);
                 const out = new Uint8Array(6 + drumLength + noteLength);
                 out[0] = track.id;
@@ -14259,7 +14295,7 @@ var pxt;
                 const noteLength = get16BitNumber(buf, currentOffset);
                 currentOffset += 2;
                 while (currentOffset < offset + 4 + drumByteLength + noteLength) {
-                    res.notes.push(decodeNoteEvent(buf, currentOffset));
+                    res.notes.push(decodeNoteEvent(buf, currentOffset, 0, true));
                     currentOffset += 5 + res.notes[res.notes.length - 1].notes.length;
                 }
                 return [res, currentOffset];
@@ -14326,6 +14362,27 @@ var pxt;
                     tracks: [
                         {
                             id: 0,
+                            name: lf("Dog"),
+                            notes: [],
+                            iconURI: "/static/music-editor/dog.png",
+                            instrument: {
+                                waveform: 1,
+                                octave: 4,
+                                ampEnvelope: {
+                                    attack: 10,
+                                    decay: 100,
+                                    sustain: 500,
+                                    release: 100,
+                                    amplitude: 1024
+                                },
+                                pitchLFO: {
+                                    frequency: 5,
+                                    amplitude: 0
+                                }
+                            }
+                        },
+                        {
+                            id: 1,
                             name: lf("Duck"),
                             notes: [],
                             iconURI: "/static/music-editor/duck.png",
@@ -14357,7 +14414,7 @@ var pxt;
                             }
                         },
                         {
-                            id: 1,
+                            id: 2,
                             name: lf("Cat"),
                             notes: [],
                             iconURI: "/static/music-editor/cat.png",
@@ -14384,27 +14441,6 @@ var pxt;
                                 }
                             }
                         },
-                        {
-                            id: 2,
-                            name: lf("Dog"),
-                            notes: [],
-                            iconURI: "/static/music-editor/dog.png",
-                            instrument: {
-                                waveform: 1,
-                                octave: 4,
-                                ampEnvelope: {
-                                    attack: 10,
-                                    decay: 100,
-                                    sustain: 500,
-                                    release: 100,
-                                    amplitude: 1024
-                                },
-                                pitchLFO: {
-                                    frequency: 5,
-                                    amplitude: 0
-                                }
-                            }
-                        },
                         {
                             id: 3,
                             name: lf("Fish"),