Update with framework changes

This commit is contained in:
smoogipoo 2021-07-28 21:54:11 +09:00
parent 34c671f712
commit 89f0739a4a
2 changed files with 5 additions and 3 deletions

View File

@ -148,8 +148,12 @@ namespace osu.Game.Audio
if (dataStream == null) if (dataStream == null)
return null; return null;
Track track = new TrackBass(dataStream, (IBassAudioMixer)defaultMixer); // Todo: This is quite unsafe. TrackBass shouldn't be exposed as public.
Track track = new TrackBass(dataStream);
defaultMixer.Add(track);
AddItem(track); AddItem(track);
return track; return track;
} }

View File

@ -10,7 +10,6 @@ using JetBrains.Annotations;
using osu.Framework; using osu.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Audio; using osu.Framework.Audio;
using osu.Framework.Audio.Mixing;
using osu.Framework.Audio.Track; using osu.Framework.Audio.Track;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -291,7 +290,6 @@ namespace osu.Game.Tests.Visual
private bool running; private bool running;
public TrackVirtualManual(IFrameBasedClock referenceClock) public TrackVirtualManual(IFrameBasedClock referenceClock)
: base(new NullAudioMixer())
{ {
this.referenceClock = referenceClock; this.referenceClock = referenceClock;
Length = double.PositiveInfinity; Length = double.PositiveInfinity;