sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove silly weld weld weld.

Browse Source
This commit is contained in:
Dean Herbert
2016-11-29 18:35:40 +09:00
parent bb37e5d955
commit 139fe873f3
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -14,10 +14,6 @@ namespace osu.Game.Graphics.UserInterface.Volume
{ {
internal class VolumeControl : OverlayContainer internal class VolumeControl : OverlayContainer
{ {
private BindableDouble volumeGlobal = new BindableDouble();
private BindableDouble volumeSample = new BindableDouble();
private BindableDouble volumeTrack = new BindableDouble();
private VolumeMeter volumeMeterMaster; private VolumeMeter volumeMeterMaster;
private void volumeChanged(object sender, EventArgs e) private void volumeChanged(object sender, EventArgs e)
@ -55,21 +51,18 @@ namespace osu.Game.Graphics.UserInterface.Volume
{ {
base.LoadComplete(); base.LoadComplete();
volumeGlobal.ValueChanged += volumeChanged; volumeMeterMaster.Bindable.ValueChanged += volumeChanged;
volumeSample.ValueChanged += volumeChanged; volumeMeterEffect.Bindable.ValueChanged += volumeChanged;
volumeTrack.ValueChanged += volumeChanged; volumeMeterMusic.Bindable.ValueChanged += volumeChanged;
volumeMeterMaster.Bindable.Weld(volumeGlobal);
volumeMeterEffect.Bindable.Weld(volumeSample);
volumeMeterMusic.Bindable.Weld(volumeTrack);
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {
volumeGlobal.ValueChanged -= volumeChanged;
volumeSample.ValueChanged -= volumeChanged;
volumeTrack.ValueChanged -= volumeChanged;
base.Dispose(isDisposing); base.Dispose(isDisposing);
volumeMeterMaster.Bindable.ValueChanged -= volumeChanged;
volumeMeterEffect.Bindable.ValueChanged -= volumeChanged;
volumeMeterMusic.Bindable.ValueChanged -= volumeChanged;
} }
public void Adjust(InputState state) public void Adjust(InputState state)
@ -86,9 +79,9 @@ namespace osu.Game.Graphics.UserInterface.Volume
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio) private void load(AudioManager audio)
{ {
volumeGlobal.Weld(audio.Volume); volumeMeterMaster.Bindable.Weld(audio.Volume);
volumeSample.Weld(audio.VolumeSample); volumeMeterEffect.Bindable.Weld(audio.VolumeSample);
volumeTrack.Weld(audio.VolumeTrack); volumeMeterMusic.Bindable.Weld(audio.VolumeTrack);
} }
ScheduledDelegate popOutDelegate; ScheduledDelegate popOutDelegate;