h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-06 22:33:13 +08:00
Code Issues Releases Wiki Activity

Rename VolumeScaler to BindableVolume

Browse Source
This commit is contained in:
Mike Will 2025-01-13 07:20:52 -05:00
parent 6d8516aef8
commit d7d536ada1
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
{ {
protected override LocalisableString Header => AudioSettingsStrings.VolumeHeader; protected override LocalisableString Header => AudioSettingsStrings.VolumeHeader;
private readonly VolumeScaler volumeInactive = new VolumeScaler(); private readonly BindableVolume volumeInactive = new BindableVolume();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio, OsuConfigManager config) private void load(AudioManager audio, OsuConfigManager config)
@ -29,34 +29,34 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
{ {
LabelText = AudioSettingsStrings.MasterVolume, LabelText = AudioSettingsStrings.MasterVolume,
Current = audio.Volume.Scaled, Current = audio.Volume.Scaled,
KeyboardStep = (float)VolumeScaler.STEP, KeyboardStep = (float)BindableVolume.STEP,
}, },
new VolumeAdjustSlider new VolumeAdjustSlider
{ {
LabelText = AudioSettingsStrings.MasterVolumeInactive, LabelText = AudioSettingsStrings.MasterVolumeInactive,
Current = volumeInactive.Scaled, Current = volumeInactive.Scaled,
KeyboardStep = (float)VolumeScaler.STEP, KeyboardStep = (float)BindableVolume.STEP,
PlaySamplesOnAdjust = true, PlaySamplesOnAdjust = true,
}, },
new VolumeAdjustSlider new VolumeAdjustSlider
{ {
LabelText = AudioSettingsStrings.EffectVolume, LabelText = AudioSettingsStrings.EffectVolume,
Current = audio.VolumeSample.Scaled, Current = audio.VolumeSample.Scaled,
KeyboardStep = (float)VolumeScaler.STEP, KeyboardStep = (float)BindableVolume.STEP,
}, },
new VolumeAdjustSlider new VolumeAdjustSlider
{ {
LabelText = AudioSettingsStrings.MusicVolume, LabelText = AudioSettingsStrings.MusicVolume,
Current = audio.VolumeTrack.Scaled, Current = audio.VolumeTrack.Scaled,
KeyboardStep = (float)VolumeScaler.STEP, KeyboardStep = (float)BindableVolume.STEP,
}, },
}; };
} }
private partial class DecibelSliderBar : RoundedSliderBar<double> private partial class DecibelSliderBar : RoundedSliderBar<double>
{ {
public override LocalisableString TooltipText => (Current.Value <= VolumeScaler.MIN ? "-∞" : Current.Value.ToString("+#0.0;-#0.0;+0.0")) + " dB"; public override LocalisableString TooltipText => (Current.Value <= BindableVolume.MIN ? "-∞" : Current.Value.ToString("+#0.0;-#0.0;+0.0")) + " dB";
} }
private partial class VolumeAdjustSlider : SettingsSlider<double> private partial class VolumeAdjustSlider : SettingsSlider<double>

2
osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
View File

@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Toolbar
base.LoadComplete(); base.LoadComplete();
globalVolume = audio.Volume.Scaled.GetBoundCopy(); globalVolume = audio.Volume.Scaled.GetBoundCopy();
globalVolume.BindValueChanged(v => volumeBar.ResizeHeightTo((float)(1 - (v.NewValue / VolumeScaler.MIN)), 200, Easing.OutQuint), true); globalVolume.BindValueChanged(v => volumeBar.ResizeHeightTo((float)(1 - (v.NewValue / BindableVolume.MIN)), 200, Easing.OutQuint), true);
} }
protected override bool OnKeyDown(KeyDownEvent e) protected override bool OnKeyDown(KeyDownEvent e)

8
osu.Game/Overlays/Volume/VolumeMeter.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Volume
protected static readonly Vector2 LABEL_SIZE = new Vector2(120, 20); protected static readonly Vector2 LABEL_SIZE = new Vector2(120, 20);
public BindableDouble Bindable { get; } = new BindableDouble { MinValue = VolumeScaler.MIN, MaxValue = 0, Precision = adjust_step }; public BindableDouble Bindable { get; } = new BindableDouble { MinValue = BindableVolume.MIN, MaxValue = 0, Precision = adjust_step };
protected readonly float CircleSize; protected readonly float CircleSize;
@ -252,7 +252,7 @@ namespace osu.Game.Overlays.Volume
get => displayVolume; get => displayVolume;
set set
{ {
percentage = 1 - (value / VolumeScaler.MIN); percentage = 1 - (value / BindableVolume.MIN);
int step = (int)Math.Round(value / adjust_step); int step = (int)Math.Round(value / adjust_step);
bool stepChanged = step != currentStep; bool stepChanged = step != currentStep;
@ -304,9 +304,9 @@ namespace osu.Game.Overlays.Volume
private set => Bindable.Value = value; private set => Bindable.Value = value;
} }
private const double adjust_step = VolumeScaler.STEP; private const double adjust_step = BindableVolume.STEP;
private const int step_min = (int)(VolumeScaler.MIN / VolumeScaler.STEP); private const int step_min = (int)(BindableVolume.MIN / BindableVolume.STEP);
private const int step_max = 0; private const int step_max = 0;
public void Increase(double amount = 1, bool isPrecise = false) => adjust(amount, isPrecise); public void Increase(double amount = 1, bool isPrecise = false) => adjust(amount, isPrecise);