diff --git a/osu.Android.props b/osu.Android.props
index 591db6e2c2..f8cd4e41d4 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
-
+
diff --git a/osu.Game/Audio/PreviewTrackManager.cs b/osu.Game/Audio/PreviewTrackManager.cs
index d88fd1e62b..dab5fcbe5f 100644
--- a/osu.Game/Audio/PreviewTrackManager.cs
+++ b/osu.Game/Audio/PreviewTrackManager.cs
@@ -7,6 +7,7 @@ using System.IO;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio;
+using osu.Framework.Audio.Mixing;
using osu.Framework.Audio.Track;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@@ -30,11 +31,11 @@ namespace osu.Game.Audio
private readonly BindableNumber globalTrackVolumeAdjust = new BindableNumber(OsuGameBase.GLOBAL_TRACK_VOLUME_ADJUST);
[BackgroundDependencyLoader]
- private void load()
+ private void load(AudioManager audioManager)
{
// this is a temporary solution to get around muting ourselves.
// todo: update this once we have a BackgroundTrackManager or similar.
- trackStore = new PreviewTrackStore(new OnlineStore());
+ trackStore = new PreviewTrackStore(audioManager.Mixer, new OnlineStore());
audio.AddItem(trackStore);
trackStore.AddAdjustment(AdjustableProperty.Volume, globalTrackVolumeAdjust);
@@ -118,10 +119,12 @@ namespace osu.Game.Audio
private class PreviewTrackStore : AudioCollectionManager, ITrackStore
{
+ private readonly AudioMixer defaultMixer;
private readonly IResourceStore store;
- internal PreviewTrackStore(IResourceStore store)
+ internal PreviewTrackStore(AudioMixer defaultMixer, IResourceStore store)
{
+ this.defaultMixer = defaultMixer;
this.store = store;
}
@@ -145,8 +148,12 @@ namespace osu.Game.Audio
if (dataStream == null)
return null;
+ // Todo: This is quite unsafe. TrackBass shouldn't be exposed as public.
Track track = new TrackBass(dataStream);
+
+ defaultMixer.Add(track);
AddItem(track);
+
return track;
}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0c26bce8c9..ec59b28ceb 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index b7f252820c..bcc4b5f254 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
-
+
@@ -93,7 +93,7 @@
-
+