centralize in simdriver

microsoft · Aug 28, 2023 · 00b73d9 · 00b73d9
1 parent f3ef1ce
commit 00b73d9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/multiplayer/src/services/simHost.ts b/multiplayer/src/services/simHost.ts
@@ -372,7 +372,6 @@ export async function simulateAsync(
     driver.options.onSimulatorCommand = msg => {
         if (msg.command === "restart") {
             runOptions.storedState = getStoredState(runOpts);
-            driver.stopSound();
             driver.run(js, runOptions);
         }
         if (msg.command == "setstate") {

diff --git a/pxtrunner/runner.ts b/pxtrunner/runner.ts
@@ -388,7 +388,6 @@ namespace pxt.runner {
         simDriver.options.onSimulatorCommand = msg => {
             if (msg.command === "restart") {
                 runOptions.storedState = getStoredState(simOptions.id)
-                simDriver.stopSound();
                 simDriver.run(js, runOptions);
             }
             if (msg.command == "setstate") {

diff --git a/pxtsim/simdriver.ts b/pxtsim/simdriver.ts
@@ -512,13 +512,15 @@ namespace pxsim {
 
         public stop(unload = false, starting = false) {
             this.clearDebugger();
+            this.stopSound();
             this.postMessage({ type: 'stop', source: MESSAGE_SOURCE });
             this.setState(starting ? SimulatorState.Starting : SimulatorState.Stopped);
             if (unload)
                 this.unload();
         }
 
         public suspend() {
+            this.stopSound();
             this.postMessage({ type: 'stop', source: MESSAGE_SOURCE });
             this.setState(SimulatorState.Suspended);
         }
@@ -695,6 +697,7 @@ namespace pxsim {
                 activePlayer: opts.activePlayer,
                 theme: opts.theme,
             }
+            this.stopSound();
             this.start();
         }
 

diff --git a/webapp/src/app.tsx b/webapp/src/app.tsx
@@ -3645,7 +3645,6 @@ export class ProjectView
             || this.debugOptionsChanged()) {
             this.startSimulator();
         } else {
-            simulator.driver.stopSound();
             simulator.driver.restart(); // fast restart
         }
         simulator.driver.focus()

diff --git a/webapp/src/simulator.ts b/webapp/src/simulator.ts
@@ -350,7 +350,6 @@ export function mute(mute: boolean) {
 
 export function stop(unload?: boolean, starting?: boolean) {
     if (!driver) return;
-    driver.stopSound();
     driver.stop(unload, starting);
 }