feat(singer) add console logs

Author: Sheel2007

modules/singer/playground/pages/Voice.tsx

@@ -1,3 +1,99 @@
+import { Voice } from '@/core/voice';
+import SynthUtils from '@/core/synthUtils';
+import * as Tone from 'tone';
+import { _state, noteValueToSeconds, _defaultSynth, _polySynth } from '@/singer';
+import { setupSynthUtils } from '@/core/synthUtils';
+import { injected } from '@/index';
+
+await (async () => {
+  const { importAssets, getAsset } = await import('@sugarlabs/mb4-assets');
+  const assetManifest = (await import('@sugarlabs/mb4-assets')).default;
+  await importAssets(
+    Object.entries(assetManifest).map(([identifier, manifest]) => ({ identifier, manifest })),
+    () => undefined,
+  );
+
+  injected.assets = {
+    'audio.guitar': getAsset('audio.guitar')!,
+    'audio.piano': getAsset('audio.piano')!,
+    'audio.snare': getAsset('audio.snare')!,
+  };
+
+})();
+
+function _getSynth(synthType: string) {
+  switch (synthType) {
+    case 'polysynth':
+      return _polySynth;
+  }
+  return _defaultSynth;
+}
+
+async function playSynth(synthType: string) {
+  await Tone.start();
+  const synth = _getSynth(synthType);
+  _state.notesPlayed = 0;
+  console.log('playing c4 using', synthType);
+  const now = Tone.now();
+  let offset = noteValueToSeconds(_state.notesPlayed);
+  synth.triggerAttackRelease('c4', '4n', now + offset);
+  _state.notesPlayed += 4;
+}
+
+async function voice() {
+  const synth = new SynthUtils();
+  const myVoice = new Voice('myvoice', synth);
+
+  await setupSynthUtils();
+
+  myVoice.playNote('g4', 1 / 4, 'piano');
+
+  // synth.trigger(['c4', 'g5'], 1/2, 'piano', 0);
+
+  // const sampler = new Tone.Sampler({
+  //   urls: {
+  //     A1: "A1.mp3",
+  //     A2: "A2.mp3",
+  //   },
+  //   baseUrl: "https://tonejs.github.io/audio/casio/",
+  //   onload: () => {
+  //     sampler.triggerAttackRelease(["C4", "E4", "G4"], 4, 2);
+  //   }
+  // }).toDestination();
+
+
+  // _state.notesPlayed = 0;
+  // const now = Tone.now();
+  // let offset = noteValueToSeconds(_state.notesPlayed);
+  // synth.trigger(['c4', 'd4'], 4, 'electronic synth', now + offset);
+  // _state.notesPlayed += 4;
+}
+
 export default function (): JSX.Element {
-  return <div>Voice Testbench</div>;
+  return (
+    <div>
+      <h1>Voice Component</h1>
+      <button
+        onClick={async () => {
+          await playSynth('default');
+        }}
+      >
+        Default Synth
+      </button>
+      <button
+        onClick={async () => {
+          await playSynth('polysynth');
+        }}
+      >
+        PolySynth
+      </button>
+      <button
+        onClick={async () => {
+          await voice();
+        }}
+      >
+        Voice Sample Synth
+      </button>
+    </div>
+  );
 }

modules/singer/src/core/synthUtils.ts

@@ -107,10 +107,11 @@ export default class SynthUtils implements ISynthUtils {
         }
 
         const _pitch = this.samples[sampleName]['centerNote'];
+
         this.samplerSynths.set(
             sampleName,
             new Tone.Sampler({
-                _pitch: this.samples[sampleName]['data'],
+                [_pitch]: this.samples[sampleName]['data'],
             }),
         );
     }
@@ -232,12 +233,12 @@ export default class SynthUtils implements ISynthUtils {
     ) {
         const now = Tone.now();
 
-        if (instrumentName in this.builtinSynths) {
+        if (this.builtinSynths.has(instrumentName)) {
             const synth = this.getBuiltinSynth(instrumentName);
             if (synth !== undefined) {
                 synth.triggerAttackRelease(pitches, noteValueInSeconds, now + offset);
             }
-        } else if (instrumentName in this.samplerSynths) {
+        } else if (this.samplerSynths.has(instrumentName)) {
             const synth = this.samplerSynths.get(instrumentName);
             if (synth !== undefined) {
                 Tone.loaded().then(() => {
@@ -252,7 +253,7 @@ export default class SynthUtils implements ISynthUtils {
                     }
                 });
             }
-        } else if (instrumentName in this.playerSynths) {
+        } else if (this.playerSynths.has(instrumentName)) {
             const synth = this.playerSynths.get(instrumentName);
             if (synth !== undefined) {
                 Tone.loaded().then(() => {

modules/singer/src/core/voice.ts

@@ -446,6 +446,7 @@ export class Voice implements IVoice {
         }
 
         if (this._synthUtils !== null) {
+            console.log('calling synthUtils trigger function');
             this._synthUtils.trigger(
                 pitches,
                 noteValue,
@@ -475,6 +476,8 @@ export class Voice implements IVoice {
      * @throws {InvalidArgumentError}
      */
     public playNote(pitch: string | number, noteValue: number, instrumentName: string) {
+        console.log('calling voice playNote function');
         this.playNotes([pitch], noteValue, instrumentName, 0, true);
     }
 }
+