Share code with setAmplitudeU10.

microbit-matt-hillsdon · microbit-matt-hillsdon · commit 09d8c8423f56 · 2022-09-28T16:10:24.000+01:00
Stop and clear the field in both cases.
diff --git a/src/board/audio/index.ts b/src/board/audio/index.ts
@@ -125,10 +125,7 @@ export class Audio {
   }
 
   setAmplitudeU10(amplitudeU10: number) {
-    if (this.oscillator) {
-      this.oscillator.stop();
-      this.oscillator = undefined;
-    }
+    this.stopOscillator();
     if (amplitudeU10) {
       this.oscillator = this.context!.createOscillator();
       this.oscillator.type = "sine";
@@ -139,7 +136,14 @@ export class Audio {
   }
 
   boardStopped() {
-    this.oscillator?.stop();
+    this.stopOscillator();
+  }
+
+  private stopOscillator() {
+    if (this.oscillator) {
+      this.oscillator.stop();
+      this.oscillator = undefined;
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -125,10 +125,7 @@ export class Audio {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`setAmplitudeU10(amplitudeU10: number) {`
`128`		`- if (this.oscillator) {`
`129`		`- this.oscillator.stop();`
`130`		`- this.oscillator = undefined;`
`131`		`- }`
	`128`	`+ this.stopOscillator();`
`132`	`129`	`if (amplitudeU10) {`
`133`	`130`	`this.oscillator = this.context!.createOscillator();`
`134`	`131`	`this.oscillator.type = "sine";`
`@@ -139,7 +136,14 @@ export class Audio {`
`139`	`136`	`}`
`140`	`137`
`141`	`138`	`boardStopped() {`
`142`		`- this.oscillator?.stop();`
	`139`	`+ this.stopOscillator();`
	`140`	`+ }`
	`141`	`+`
	`142`	`+ private stopOscillator() {`
	`143`	`+ if (this.oscillator) {`
	`144`	`+ this.oscillator.stop();`
	`145`	`+ this.oscillator = undefined;`
	`146`	`+ }`
`143`	`147`	`}`
`144`	`148`	`}`
`145`	`149`