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

move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton

Browse Source
This commit is contained in:
Jorolf
2017-10-06 21:00:23 +02:00
parent fffeac638f
commit 5a8b8dacbb
8 changed files with 117 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
osu.Game/Overlays/BeatmapSet/PreviewButton.cs
View File

@ -27,21 +27,13 @@ namespace osu.Game.Overlays.BeatmapSet
private readonly Box bg, progress;
private readonly PlayButton playButton;
private Track preview;
private readonly Bindable<bool> playing = new Bindable<bool>();
private Track preview => playButton.Preview;
private Bindable<bool> playing => playButton.Playing;
private BeatmapSetInfo beatmapSet;
public BeatmapSetInfo BeatmapSet
{
get { return beatmapSet; }
set
{
if (value == beatmapSet) return;
beatmapSet = value;
playing.Value = false;
preview = null;
}
get { return playButton.SetInfo; }
set { playButton.SetInfo = value; }
}
public PreviewButton()
@ -69,7 +61,7 @@ namespace osu.Game.Overlays.BeatmapSet
Alpha = 0f,
},
},
playButton = new PlayButton(playing)
playButton = new PlayButton()
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@ -78,7 +70,7 @@ namespace osu.Game.Overlays.BeatmapSet
};
Action = () => playing.Value = !playing.Value;
playing.ValueChanged += updatePlayingState;
playing.ValueChanged += newValue => progress.FadeTo(newValue ? 1 : 0, 100);
}
[BackgroundDependencyLoader]
@ -94,11 +86,6 @@ namespace osu.Game.Overlays.BeatmapSet
if (playing.Value && preview != null)
{
progress.Width = (float)(preview.CurrentTime / preview.Length);
if (preview.HasCompleted)
{
playing.Value = false;
preview = null;
}
}
}
@ -119,38 +106,5 @@ namespace osu.Game.Overlays.BeatmapSet
bg.FadeColour(Color4.Black.Opacity(0.25f), 100);
base.OnHoverLost(state);
}
private void updatePlayingState(bool newValue)
{
if (preview == null)
{
playButton.Loading = true;
audioWrapper.Child = new AsyncLoadWrapper(new AudioLoadWrapper(BeatmapSet.OnlineInfo.Preview)
{
OnLoadComplete = d =>
{
playButton.Loading = false;
preview = (d as AudioLoadWrapper)?.Preview;
playing.TriggerChange();
},
});
}
else
{
if (newValue)
{
progress.FadeIn(100);
preview.Seek(0);
preview.Start();
}
else
{
progress.FadeOut(100);
preview.Stop();
}
}
}
}
}