From f8c27717760636a6aee5cb974c60dd4bf2c7f1c1 Mon Sep 17 00:00:00 2001
From: Eric Rosenbaum <eric.rosenbaum@gmail.com>
Date: Tue, 13 Mar 2018 11:43:53 -0400
Subject: [PATCH] Use target volume, not custom state

---
 src/blocks/scratch3_sound.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/blocks/scratch3_sound.js b/src/blocks/scratch3_sound.js
index 443ccc1d7..c4bb6039e 100644
--- a/src/blocks/scratch3_sound.js
+++ b/src/blocks/scratch3_sound.js
@@ -37,7 +37,6 @@ class Scratch3SoundBlocks {
      */
     static get DEFAULT_SOUND_STATE () {
         return {
-            volume: 100,
             effects: {
                 pitch: 0,
                 pan: 0
@@ -267,22 +266,19 @@ class Scratch3SoundBlocks {
     }
 
     changeVolume (args, util) {
-        const soundState = this._getSoundState(util.target);
-        const volume = Cast.toNumber(args.VOLUME) + soundState.volume;
+        const volume = Cast.toNumber(args.VOLUME) + util.target.volume;
         this._updateVolume(volume, util);
     }
 
     _updateVolume (volume, util) {
-        const soundState = this._getSoundState(util.target);
         volume = MathUtil.clamp(volume, 0, 100);
-        soundState.volume = volume;
+        util.target.volume = volume;
         if (util.target.audioPlayer === null) return;
-        util.target.audioPlayer.setVolume(soundState.volume);
+        util.target.audioPlayer.setVolume(util.target.volume);
     }
 
     getVolume (args, util) {
-        const soundState = this._getSoundState(util.target);
-        return soundState.volume;
+        return util.target.volume;
     }
 
     soundsMenu (args) {