RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TestCase reset.

This commit is contained in:
Huo Yaoyuan 2016-10-24 18:26:50 +08:00
parent b671a33911
commit 0da78c19a2
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs
View File

@ -22,6 +22,8 @@ class TestCaseMusicController : TestCase
IFrameBasedClock ourClock;
protected override IFrameBasedClock Clock => ourClock;
protected MusicController mc;
public override void Load(BaseGame game)
{
base.Load(game);
@ -32,7 +34,8 @@ public override void Reset()
{
base.Reset();
ourClock.ProcessFrame();
MusicController mc = new MusicController
mc?.CurrentTrack?.Stop();
mc = new MusicController
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre

22
osu.Game/Overlays/MusicController.cs
View File

@ -29,7 +29,7 @@ public class MusicController : OverlayContainer
private OsuGameBase osuGame;
private List<BeatmapSetInfo> playList;
private BeatmapSetInfo currentPlay;
private AudioTrack currentTrack;
public AudioTrack CurrentTrack { get; set; }//TODO:gets exterally
public override void Load(BaseGame game)
{
base.Load(game);
@ -83,15 +83,15 @@ public override void Load(BaseGame game)
Position = new Vector2(0, 30),
Action = () =>
{
if (currentTrack == null) return;
if (currentTrack.IsRunning)
if (CurrentTrack == null) return;
if (CurrentTrack.IsRunning)
{
currentTrack.Stop();
CurrentTrack.Stop();
playButton.Icon = FontAwesome.play_circle_o;
}
else
{
currentTrack.Start();
CurrentTrack.Start();
playButton.Icon = FontAwesome.pause;
}
},
@ -179,9 +179,9 @@ public override void Load(BaseGame game)
protected override void Update()
{
base.Update();
if (currentTrack == null) return;
progress.Width = (float)(currentTrack.CurrentTime / currentTrack.Length);
if (currentTrack.HasCompleted) next();
if (CurrentTrack == null) return;
progress.Width = (float)(CurrentTrack.CurrentTime / CurrentTrack.Length);
if (CurrentTrack.HasCompleted) next();
}
private void prev()
@ -208,9 +208,9 @@ private void play(BeatmapSetInfo beatmap, bool? isNext)
title.Text = metadata.TitleUnicode ?? metadata.Title;
artist.Text = metadata.ArtistUnicode ?? metadata.Artist;
ArchiveReader reader = osuGame.Beatmaps.GetReader(currentPlay);
currentTrack?.Stop();
currentTrack = new AudioTrackBass(reader.ReadFile(metadata.AudioFile));
currentTrack.Start();
CurrentTrack?.Stop();
CurrentTrack = new AudioTrackBass(reader.ReadFile(metadata.AudioFile));
CurrentTrack.Start();
Sprite newBackground = getScaledSprite(TextureLoader.FromStream(reader.ReadFile(metadata.BackgroundFile)));
Add(newBackground);
if (isNext == true)