From 139fe873f3d3833325a90d400926100595fef70f Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 29 Nov 2016 18:35:40 +0900 Subject: [PATCH] Remove silly weld weld weld. --- .../UserInterface/Volume/VolumeControl.cs | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs index c94eb40c17..13accc4914 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs @@ -14,10 +14,6 @@ namespace osu.Game.Graphics.UserInterface.Volume { internal class VolumeControl : OverlayContainer { - private BindableDouble volumeGlobal = new BindableDouble(); - private BindableDouble volumeSample = new BindableDouble(); - private BindableDouble volumeTrack = new BindableDouble(); - private VolumeMeter volumeMeterMaster; private void volumeChanged(object sender, EventArgs e) @@ -55,21 +51,18 @@ namespace osu.Game.Graphics.UserInterface.Volume { base.LoadComplete(); - volumeGlobal.ValueChanged += volumeChanged; - volumeSample.ValueChanged += volumeChanged; - volumeTrack.ValueChanged += volumeChanged; - - volumeMeterMaster.Bindable.Weld(volumeGlobal); - volumeMeterEffect.Bindable.Weld(volumeSample); - volumeMeterMusic.Bindable.Weld(volumeTrack); + volumeMeterMaster.Bindable.ValueChanged += volumeChanged; + volumeMeterEffect.Bindable.ValueChanged += volumeChanged; + volumeMeterMusic.Bindable.ValueChanged += volumeChanged; } protected override void Dispose(bool isDisposing) { - volumeGlobal.ValueChanged -= volumeChanged; - volumeSample.ValueChanged -= volumeChanged; - volumeTrack.ValueChanged -= volumeChanged; base.Dispose(isDisposing); + + volumeMeterMaster.Bindable.ValueChanged -= volumeChanged; + volumeMeterEffect.Bindable.ValueChanged -= volumeChanged; + volumeMeterMusic.Bindable.ValueChanged -= volumeChanged; } public void Adjust(InputState state) @@ -86,9 +79,9 @@ namespace osu.Game.Graphics.UserInterface.Volume [BackgroundDependencyLoader] private void load(AudioManager audio) { - volumeGlobal.Weld(audio.Volume); - volumeSample.Weld(audio.VolumeSample); - volumeTrack.Weld(audio.VolumeTrack); + volumeMeterMaster.Bindable.Weld(audio.Volume); + volumeMeterEffect.Bindable.Weld(audio.VolumeSample); + volumeMeterMusic.Bindable.Weld(audio.VolumeTrack); } ScheduledDelegate popOutDelegate;