sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-08 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11809 from peppy/fix-audio-preview-volume

Browse Source 
Fix audio previews not being adjusted in volume correctly
This commit is contained in:
Dan Balasescu 2021-02-17 23:35:18 +09:00 committed by GitHub
commit cb4f1f2f7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Audio/PreviewTrackManager.cs
View File

@ -27,6 +27,8 @@ namespace osu.Game.Audio
protected TrackManagerPreviewTrack CurrentTrack; protected TrackManagerPreviewTrack CurrentTrack;
private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(OsuGameBase.GLOBAL_TRACK_VOLUME_ADJUST);
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
@ -35,6 +37,7 @@ namespace osu.Game.Audio
trackStore = new PreviewTrackStore(new OnlineStore()); trackStore = new PreviewTrackStore(new OnlineStore());
audio.AddItem(trackStore); audio.AddItem(trackStore);
trackStore.AddAdjustment(AdjustableProperty.Volume, globalTrackVolumeAdjust);
trackStore.AddAdjustment(AdjustableProperty.Volume, audio.VolumeTrack); trackStore.AddAdjustment(AdjustableProperty.Volume, audio.VolumeTrack);
} }

7
osu.Game/OsuGameBase.cs
View File

@ -156,7 +156,12 @@ namespace osu.Game
protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager(); protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(0.5f); /// <summary>
/// The maximum volume at which audio tracks should playback. This can be set lower than 1 to create some head-room for sound effects.
/// </summary>
internal const double GLOBAL_TRACK_VOLUME_ADJUST = 0.5;
private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(GLOBAL_TRACK_VOLUME_ADJUST);
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()