Making setMaster and setSynth as previews when they are standalone (#4396)

* Feat: Preview_Voice

* removed extra line

Author: falgun143

js/blocks/VolumeBlocks.js

@@ -578,7 +578,7 @@ function setupVolumeBlocks(activity) {
                 }
             }
 
-            Singer.VolumeActions.setSynthVolume(arg0, arg1, turtle);
+            Singer.VolumeActions.setSynthVolume(arg0, arg1, turtle, blk);
         }
     }
 

js/logo.js

@@ -367,7 +367,6 @@ class Logo {
             tur.singer.synthVolume[DEFAULTVOICE] = [DEFAULTVOLUME];
         }
 
-        Singer.setMasterVolume(this, DEFAULTVOLUME);
         for (const turtle in this.activity.turtles.turtleList) {
             for (const synth in this.activity.turtles.ithTurtle(turtle).singer.synthVolume) {
                 Singer.setSynthVolume(this, turtle, synth, DEFAULTVOLUME);
@@ -1030,7 +1029,6 @@ class Logo {
 
         Singer.masterBPM = TARGETBPM;
         Singer.defaultBPMFactor = TONEBPM / TARGETBPM;
-        Singer.masterVolume = [DEFAULTVOLUME];
         this.synth.changeInTemperament = false;
 
         this._checkingCompletionState = false;

js/piemenus.js

@@ -2594,7 +2594,6 @@ const piemenuVoices = (block, voiceLabels, voiceValues, categories, voice, rotat
         }
 
         setTimeout(() => {
-            that.activity.logo.synth.setMasterVolume(DEFAULTVOLUME);
             Singer.setSynthVolume(that.activity.logo, 0, voice, DEFAULTVOLUME);
             that.activity.logo.synth.trigger(0, "G4", 1 / 4, voice, null, null, false);
             that.activity.logo.synth.start();

js/turtle-singer.js

@@ -665,11 +665,12 @@ class Singer {
      * @param {Number} volume
      * @returns {void}
      */
-    static setMasterVolume(logo, volume) {
+    static setMasterVolume(logo, volume, blk) {
         const activity = logo.activity;
+        const firstConnection = activity.logo.blockList[blk].connections[0];
+        const lastConnection = last(activity.logo.blockList[blk].connections);
         volume = Math.min(Math.max(volume, 0), 100);
-
-        logo.synth.setMasterVolume(volume);
+        logo.synth.setMasterVolume(volume, firstConnection, lastConnection);
         for (const turtle of activity.turtles.turtleList) {
             for (const synth in turtle.singer.synthVolume) {
                 turtle.singer.synthVolume[synth].push(volume);
@@ -687,18 +688,18 @@ class Singer {
      * @param {Number} volume
      * @returns {void}
      */
-    static setSynthVolume(logo, turtle, synth, volume) {
+    static setSynthVolume(logo, turtle, synth, volume, blk) {
         volume = Math.min(Math.max(volume, 0), 100);
 
         switch (synth) {
             case "noise1":
             case "noise2":
             case "noise3":
                 // Noise is very very loud
-                logo.synth.setVolume(turtle, synth, volume / 25);
+                logo.synth.setVolume(turtle, synth, volume / 25, blk);
                 break;
             default:
-                logo.synth.setVolume(turtle, synth, volume);
+                logo.synth.setVolume(turtle, synth, volume, blk);
         }
     }
 

js/turtleactions/VolumeActions.js

@@ -172,11 +172,15 @@ function setupVolumeActions(activity) {
 
             if (volume === 0) activity.errorMsg(_("Setting volume to 0."), blk);
 
+            if(Singer.masterVolume.length === 2) {  
+                Singer.masterVolume.pop();
+            }
+
             Singer.masterVolume.push(volume);
 
             const tur = activity.turtles.ithTurtle(turtle);
             if (!tur.singer.suppressOutput) {
-                Singer.setMasterVolume(activity.logo, volume);
+                Singer.setMasterVolume(activity.logo, volume, blk);
             }
         }
 
@@ -210,8 +214,10 @@ function setupVolumeActions(activity) {
          * @param {Number} turtle - Turtle index in turtles.turtleList
          * @returns {void}
          */
-        static setSynthVolume(synthname, volume, turtle) {
+        static setSynthVolume(synthname, volume, turtle, blk) {
             let synth = null;
+            const firstConnection = activity.logo.blockList[blk].connections[0];
+            const lastConnection = last(activity.logo.blockList[blk].connections);
 
             if (synthname === DEFAULTVOICE || synthname === _(DEFAULTVOICE)) {
                 synth = DEFAULTVOICE;
@@ -263,6 +269,12 @@ function setupVolumeActions(activity) {
             tur.singer.synthVolume[synth].push(volume);
             if (!tur.singer.suppressOutput) {
                 Singer.setSynthVolume(activity.logo, turtle, synth, volume);
+                if(firstConnection === null && lastConnection === null) {
+                    setTimeout(()=>{
+                        activity.logo.synth.trigger(0, "G4", 1 / 4, synthname, null, null, false);
+                    },250)
+                }
+             
             }
         }
 

js/utils/synthutils.js

@@ -1375,32 +1375,41 @@ function Synth() {
 
         this._loadSample(sourceName);
         if (sourceName in this.samples.voice || sourceName in this.samples.drum) {
-            instruments[turtle][instrumentName] = this._createSampleSynth(
-                turtle,
-                instrumentName,
-                sourceName,
-                params
-            ).toDestination();
+            if (!instruments[turtle][instrumentName]) {
+                instruments[turtle][instrumentName] = this._createSampleSynth(
+                    turtle,
+                    instrumentName,
+                    sourceName,
+                    params
+                )
+            }
         } else if (sourceName in BUILTIN_SYNTHS) {
-            instruments[turtle][instrumentName] = this._createBuiltinSynth(
-                turtle,
-                instrumentName,
-                sourceName,
-                params
-            ).toDestination();
+            if (!instruments[turtle][instrumentName]) {
+                instruments[turtle][instrumentName] = this._createBuiltinSynth(
+                    turtle,
+                    instrumentName,
+                    sourceName,
+                    params
+                );
+            }
         } else if (sourceName in CUSTOM_SYNTHS) {
-            instruments[turtle][instrumentName] = this._createCustomSynth(
-                sourceName,
-                params
-            ).toDestination();
+            if (!instruments[turtle][instrumentName]) {
+                instruments[turtle][instrumentName] = this._createCustomSynth(
+                    sourceName,
+                    params
+                )
+            }
+
             instrumentsSource[instrumentName] = [0, "poly"];
         } else if (sourceName in CUSTOMSAMPLES) {
-            instruments[turtle][instrumentName] = this._createSampleSynth(
-                turtle,
-                instrumentName,
-                sourceName,
-                params
-            ).toDestination();
+            if (!instruments[turtle][instrumentName]) {
+                instruments[turtle][instrumentName] = this._createSampleSynth(
+                    turtle,
+                    instrumentName,
+                    sourceName,
+                    params
+                )
+            }
         } else {
             if (sourceName.length >= 4) {
                 if (sourceName.slice(0, 4) === "http") {
@@ -1975,35 +1984,31 @@ function Synth() {
             instruments[turtle][instrumentName].volume.value = db;
         }
     };
-
-    /**
-     * Gets the volume of a specific instrument for a given turtle.
-     * @function
-     * @memberof Synth
-     * @param {string} turtle - The name of the turtle.
-     * @param {string} instrumentName - The name of the instrument.
-     * @returns {number} The volume level.
-     * @deprecated This method is currently unused and may not return correct values.
-     */
-    this.getVolume = (turtle, instrumentName) => {
-        if (instrumentName in instruments[turtle]) {
-            return instruments[turtle][instrumentName].volume.value;
-        } else {
-            // eslint-disable-next-line no-console
-            console.debug("instrument not found");
-            return 50;
-        }
-    };
 
     /**
      * Sets the master volume for all instruments.
      * @function
      * @memberof Synth
      * @param {number} volume - The master volume level (0 to 100).
      */
-    this.setMasterVolume = volume => {
-        const db = Tone.gainToDb(volume / 100);
-        Tone.Destination.volume.rampTo(db, 0.01);
+    this.setMasterVolume = (volume, firstConnection, lastConnection) => {
+        if (!instruments[0]["electronic synth"]) {
+            this.createDefaultSynth(0);
+        }
+        this.setVolume(0, "electronic synth", volume);
+
+
+        if (firstConnection === null && lastConnection === null) {
+            // Reset volume to default (0 dB) first
+             Tone.Destination.volume.rampTo(0, 0.01); 
+            setTimeout(()=>{
+                this.trigger(0, "G4", 1 / 4, "electronic synth", null, null, false);
+            },200)
+        }
+        else{
+            const db = Tone.gainToDb(volume / 100);
+            Tone.Destination.volume.rampTo(db, 0.01);
+        } 
     };
 
     /**