improvements

mitmedialab · Jul 22, 2024 · ffd3676 · ffd3676
1 parent 1301569
commit ffd3676
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 6 deletions.
diff --git a/extensions/src/music_generation/index.ts b/extensions/src/music_generation/index.ts
@@ -78,6 +78,7 @@ export default class ExtensionNameGoesHere extends extension(details, "ui") {
   currentBeat;
   rnn;
   musicInstance;
+  generated;
 
 
   // setNotes(notes) {
@@ -142,14 +143,13 @@ export default class ExtensionNameGoesHere extends extension(details, "ui") {
       annotationType: mm.NoteSequence.TextAnnotation.TextAnnotationType.CHORD_SYMBOL,
     }));
 
-    console.log(progressionArray);
-    console.log()
-
     quantizedSequence.textAnnotations = progressionArray;
-    return [];
+    //return [];
 
-    //const continuedSequence = await this.rnn.continueSequence(quantizedSequence, 40, 1.0, ['C', 'G', 'Am', 'F']);
-    //return continuedSequence.notes;
+    const continuedSequence = await this.rnn.continueSequence(quantizedSequence, 40, 1.0, ['C', 'G', 'Am', 'F']);
+    console.log(continuedSequence.notes);
+    this.generated = continuedSequence.notes;
+    return continuedSequence.notes;
   }
 
 
@@ -246,6 +246,8 @@ export default class ExtensionNameGoesHere extends extension(details, "ui") {
 
   @(scratch.command`Play note at pitch ${"number"} for ${"number"}`)
   playNoteBlock(pitch: number, beats: number, util: BlockUtilityWithID) {
+    console.log("util");
+    console.log(util);
     if (this.musicInstance._stackTimerNeedsInit(util)) {
       let note = pitch;
       note = Math.min(Math.max(note, 0), 130);
@@ -260,18 +262,51 @@ export default class ExtensionNameGoesHere extends extension(details, "ui") {
 
       this.musicInstance._startStackTimer(util, durationSec);
 
+
+
       let oneNote = { pitch: pitch, startTime: this.currentBeat, endTime: this.currentBeat + beats };
 
       this.currentBeat += beats;
       this.userEnteredNotes.push(oneNote);
       this.startTime = this.currentBeat;
+
+
     } else {
       this.musicInstance._checkStackTimer(util);
     }
 
 
   }
 
+  delay(seconds: number): Promise<void> {
+    return new Promise(resolve => setTimeout(resolve, seconds * 1000));
+  }
+
+  @(scratch.command`Play generated`)
+  async playGenerated(util: BlockUtilityWithID) {
+    let sequenceNotes = this.musicInstance.convertToBeats(this.generated);
+    console.log(sequenceNotes);
+    for (let i = 0; i < sequenceNotes.length; i++) {
+      let note = sequenceNotes[i];
+      let beats = note.endBeat - note.startBeat;
+
+      // Play the note
+      note = Math.min(Math.max(note.pitch, 0), 130);
+      beats = Math.min(Math.max(beats, 0), 100);
+      // If the duration is 0, do not play the note. In Scratch 2.0, "play drum for 0 beats" plays the drum,
+      // but "play note for 0 beats" is silent.
+      if (beats === 0) return;
+
+      const durationSec = this.musicInstance._beatsToSec(beats);
+
+      this.musicInstance._playNote(util, note, durationSec);
+
+      // Wait for the note duration before playing the next one
+      await this.delay(durationSec);
+      util.stackFrame.timer = null;
+    }
+  }
+
   @(scratch.command`Start model`)
   async startModel() {
     await this.loadModel();

diff --git a/extensions/src/music_generation/util.js b/extensions/src/music_generation/util.js
@@ -94,6 +94,34 @@ export class Music {
         return Math.pow(2, (interval / 12));
     }
 
+    convertToBeats(sequence, stepsPerBeat = 4) {
+        return sequence.map(note => ({
+            pitch: note.pitch,
+            startBeat: note.quantizedStartStep / stepsPerBeat,
+            endBeat: note.quantizedEndStep / stepsPerBeat
+        }));
+    }
+
+    playNoteBlock(pitch, beats, util) {
+        if (this._stackTimerNeedsInit(util)) {
+            let note = pitch;
+            note = Math.min(Math.max(note, 0), 130);
+            beats = Math.min(Math.max(beats, 0), 100);
+            // If the duration is 0, do not play the note. In Scratch 2.0, "play drum for 0 beats" plays the drum,
+            // but "play note for 0 beats" is silent.
+            if (beats === 0) return;
+
+            const durationSec = this._beatsToSec(beats);
+
+            this._playNote(util, note, durationSec);
+
+            this._startStackTimer(util, durationSec);
+
+        } else {
+            this._checkStackTimer(util);
+        }
+    }
+
 
     _playNote(util, note, durationSec) {
         if (util.runtime.audioEngine === null) return;