h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-18 06:21:22 +08:00
Code Issues Releases Wiki Activity

Fix hitsounds becoming loud in editor after entering setup section (#36512)

Browse Source 
Probably closes https://github.com/ppy/osu/issues/36492.

This is dumb but it's in large part my stupidity.

To begin with, the immediate direct offending call that causes the
observed symptoms is


https://github.com/ppy/osu/blob/a401c7d5e9d6d8b05b2ec293145ad308dfe9d6d0/osu.Game/Screens/Edit/Components/FormSampleSet.cs#L296

The reason why this "invalidation" affects sample volume is that in the
framework implementation, the call [removes the relevant sample factory
from the sample store which is an audio
component](https://github.com/ppy/osu-framework/blob/5b716dcbef6f99e03188a7a7706361fa8445c754/osu.Framework/Audio/Sample/SampleStore.cs#L65-L72).
In the process it also [unbinds audio
adjustments](https://github.com/ppy/osu-framework/blob/5b716dcbef6f99e03188a7a7706361fa8445c754/osu.Framework/Audio/AudioCollectionManager.cs#L37-L38),
which *would* have the effect of resetting the sample volume to 100%,
effectively (and I've pretty much confirmed that that's what happens).

Now for why this call sometimes does the right thing and sometimes
doesn't: Sometimes the call is made in response to an *actual* change to
the beatmap skin, which is correct and expected, if very indirect, but
sometimes it is made *over-eagerly* when there is no reason to recycle
anything yet.

One such circumstance is entering the setup screen, which will still
"invalidate" (read: remove) the samples, but the compose tab hasn't seen
any change to the beatmap skin, so when it is returned to, it has no
reason to retrieve the sample again, and as such it will try to play
samples which are for better or worse in a completely undefined state
because they're not supposed to be *in use* anymore.

Therefore, the right thing here would seem to be to take the
responsibility of invalidation from a random component, and move it to a
place that's *actually* correlated to every other component needing to
recycle samples, e.g. `EditorBeatmapSkin` responding to changes in the
beatmap resources via raising `BeatmapSkinChanged`.

Unfortunately, because of the structure of everything, this recycle
needs to go from targeted to individual samples, to nuking the entire
store. The reason for this is that `RealmBackedResourceStore` does not
provide information as to *what* resources changed, it just says that
*the set of them* did.

For the recycle to be smarter, `EditorBeatmapSkin` would need to know
not only which samples were added or replaced, but also which ones were
*removed*, so that users don't hear phantom samples that no longer exist
in the editor later. That would however be a lot of hassle for nothing,
so I just recycle everything here and hope it won't matter.

As to why I could only reproduce this on this one beatmap - I'm not
super sure. The failure does not seem to be specific to beatmaps, but it
may be exacerbated by certain patterns of accessing samples which means
that beatmaps with high BPM like the one I managed to reproduce this on
may just be more susceptible to this.

As a final note, I do realise that this is not fundamentally improving
the surrounding systems and it's still a pretty rickety thing to do.
It's still on the consumers to know and respond to the sample store
recycle and this is likely to fail if a consumer ever doesn't. That
said, I have no brighter ideas at this point in time that won't involve
me spending a week refactoring audio.
This commit is contained in:
Bartłomiej Dach
2026-01-29 11:10:48 +01:00
committed by GitHub
Unverified
parent 5468215de8
commit de97660fa4
3 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/Edit/Components/FormSampleSet.cs
+1 -12
View File
@@ -289,18 +289,7 @@ namespace osu.Game.Screens.Edit.Components
AddInternal(hoverSounds = (ActualFilename.Value == null ? new HoverClickSounds(HoverSampleSet.Button) : new HoverSounds(HoverSampleSet.Button)));
if (ActualFilename.Value != null)
{
// to cover all bases, invalidate the extensionless filename (which gameplay is most likely to use)
// as well as the filename with extension (which we are using here).
editorBeatmap?.BeatmapSkin?.Skin.Samples?.Invalidate(ExpectedFilename.Value);
editorBeatmap?.BeatmapSkin?.Skin.Samples?.Invalidate(ActualFilename.Value);
sample = editorBeatmap?.BeatmapSkin?.Skin.Samples?.Get(ActualFilename.Value);
}
else
{
sample = null;
}
sample = ActualFilename.Value != null ? editorBeatmap?.BeatmapSkin?.Skin.Samples?.Get(ActualFilename.Value) : null;
});
protected override bool OnHover(HoverEvent e)
osu.Game/Screens/Edit/EditorBeatmapSkin.cs
+8 -2
View File
@@ -61,7 +61,13 @@ namespace osu.Game.Screens.Edit
ComboColours.BindCollectionChanged((_, _) => updateColours());
if (skin.BeatmapSetResources != null)
skin.BeatmapSetResources.CacheInvalidated += InvokeSkinChanged;
skin.BeatmapSetResources.CacheInvalidated += beatmapResourcesInvalidated;
}
private void beatmapResourcesInvalidated()
{
Skin.RecycleSamples();
InvokeSkinChanged();
}
public void InvokeSkinChanged() => BeatmapSkinChanged?.Invoke();
@@ -149,7 +155,7 @@ namespace osu.Game.Screens.Edit
public void Dispose()
{
if (Skin.BeatmapSetResources != null)
Skin.BeatmapSetResources.CacheInvalidated -= InvokeSkinChanged;
Skin.BeatmapSetResources.CacheInvalidated -= beatmapResourcesInvalidated;
Skin.Dispose();
}
osu.Game/Skinning/Skin.cs
+26 -13
View File
@@ -38,7 +38,7 @@ namespace osu.Game.Skinning
/// <summary>
/// A sample store which can be used to perform user file lookups for this skin.
/// </summary>
protected internal ISampleStore? Samples { get; }
protected internal ISampleStore? Samples { get; private set; }
public readonly Live<SkinInfo> SkinInfo;
@@ -84,18 +84,7 @@ namespace osu.Game.Skinning
store.AddStore(new RealmBackedResourceStore<SkinInfo>(SkinInfo, resources.Files, resources.RealmAccess));
var samples = resources.AudioManager?.GetSampleStore(store);
if (samples != null)
{
samples.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
// osu-stable performs audio lookups in order of wav -> mp3 -> ogg.
// The GetSampleStore() call above internally adds wav and mp3, so ogg is added at the end to ensure expected ordering.
samples.AddExtension(@"ogg");
}
Samples = samples;
RecycleSamples();
Textures = new TextureStore(resources.Renderer, CreateTextureLoaderStore(resources, store));
}
else
@@ -153,6 +142,30 @@ namespace osu.Game.Skinning
}
}
/// <summary>
/// Recreates <see cref="Samples"/>.
/// All users of samples from the skin are expected to manually re-retrieve their samples from this skin after this is called.
/// Exposed as public for the purpose of e.g. editing flows where the skin's set of available samples changes.
/// In such a scenario a full recycle of the store is required to avoid accidentally retrieving stale samples that don't exist in the skin anymore.
/// </summary>
public void RecycleSamples()
{
Samples?.Dispose();
var samples = resources?.AudioManager?.GetSampleStore(store);
if (samples != null)
{
samples.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
// osu-stable performs audio lookups in order of wav -> mp3 -> ogg.
// The GetSampleStore() call above internally adds wav and mp3, so ogg is added at the end to ensure expected ordering.
samples.AddExtension(@"ogg");
}
Samples = samples;
}
protected virtual IResourceStore<TextureUpload> CreateTextureLoaderStore(IStorageResourceProvider resources, IResourceStore<byte[]> storage)
=> new MaxDimensionLimitedTextureLoaderStore(resources.CreateTextureLoaderStore(storage));