RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-25 08:12:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change 'current' accessibility to protected

Browse Source
This commit is contained in:
iiSaLMaN 2019-11-14 14:20:29 +03:00
parent 4e79bbad6b
commit d2ce0878bc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ namespace osu.Game.Audio
private AudioManager audio;
private PreviewTrackStore trackStore;
private TrackManagerPreviewTrack current;
protected TrackManagerPreviewTrack CurrentTrack;
[BackgroundDependencyLoader]
private void load(AudioManager audio)
@ -48,17 +48,17 @@ namespace osu.Game.Audio
track.Started += () => Schedule(() =>
{
current?.Stop();
current = track;
CurrentTrack?.Stop();
CurrentTrack = track;
audio.Tracks.AddAdjustment(AdjustableProperty.Volume, muteBindable);
});
track.Stopped += () => Schedule(() =>
{
if (current != track)
if (CurrentTrack != track)
return;
current = null;
CurrentTrack = null;
audio.Tracks.RemoveAdjustment(AdjustableProperty.Volume, muteBindable);
});
@ -76,10 +76,10 @@ namespace osu.Game.Audio
/// <param name="source">The <see cref="IPreviewTrackOwner"/> which may be the owner of the <see cref="PreviewTrack"/>.</param>
public void StopAnyPlaying(IPreviewTrackOwner source)
{
if (current == null || current.Owner != source)
if (CurrentTrack == null || CurrentTrack.Owner != source)
return;
current.Stop();
CurrentTrack.Stop();
// CurrentTrack must not change until the scheduled stopped event has been invoked.
// To ensure that this doesn't early-return on (CurrentTrack != track) check.
}