Merge pull request #58491 from code-dot-org/music-fix-preview-plays

code-dot-org · May 11, 2024 · e897c0e · e897c0e
2 parents 1d62c2a + 16e608d
commit e897c0e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/apps/src/music/player/MusicPlayer.ts b/apps/src/music/player/MusicPlayer.ts
@@ -353,6 +353,7 @@ export default class MusicPlayer {
           effects: soundEvent.effects,
           originalBpm: soundData.bpm || DEFAULT_BPM,
           pitchShift: this.calculatePitchShift(soundData),
+          disableTempoAdjustment: soundData.type === 'preview',
         },
       ];
     } else if (event.type === 'pattern') {
@@ -550,7 +551,7 @@ export default class MusicPlayer {
   }
 
   private calculatePitchShift(soundData: SoundData) {
-    if (soundData.type === 'beat') {
+    if (['beat', 'preview'].includes(soundData.type)) {
       return 0;
     }
     const diff = this.key - (soundData.key || Key.C);

diff --git a/apps/src/music/player/ToneJSPlayer.ts b/apps/src/music/player/ToneJSPlayer.ts
@@ -167,7 +167,10 @@ class ToneJSPlayer implements AudioPlayer {
       return;
     }
 
-    const playbackRate = Transport.bpm.value / sample.originalBpm;
+    const playbackRate = sample.disableTempoAdjustment
+      ? 1
+      : Transport.bpm.value / sample.originalBpm;
+
     const player = this.createPlayer(
       buffer,
       playbackRate,

diff --git a/apps/src/music/player/types.ts b/apps/src/music/player/types.ts
@@ -100,6 +100,8 @@ export interface SampleEvent {
   effects?: Effects;
   // Length in measures to play the sample for
   length?: number;
+  // Whether tempo should not be adjusted.
+  disableTempoAdjustment?: boolean;
 }
 
 /** A sequence of notes played on a sampler instrument */