Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove effect prioritisation to fix segfaults #6214

Merged
merged 2 commits into from Mar 14, 2024
Merged

Remove effect prioritisation to fix segfaults #6214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2429414
Remove effect prioritisation to fix segfaults on Linux
smoogipoo Mar 13, 2024
b12b8a7
Merge branch 'master' into temporarily-remove-effect-priority
peppy Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 1 addition & 8 deletions osu.Framework/Audio/Mixing/Bass/BassAudioMixer.cs
View file
Open in desktop
Expand Up @@ -10,7 +10,6 @@
using ManagedBass;
using ManagedBass.Mix;
using osu.Framework.Bindables;
using osu.Framework.Development;
using osu.Framework.Extensions.EnumExtensions;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Statistics;
Expand Down Expand Up @@ -421,13 +420,7 @@ void applyEffects(int startIndex, int endIndex)
// Effects with greatest priority are stored at the front of the list.
effect.Priority = -i;

if (effect.Handle != 0)
{
// Todo: Temporary bypass to attempt to fix failing test runs.
if (!DebugUtils.IsNUnitRunning)
ManagedBass.Bass.FXSetPriority(effect.Handle, effect.Priority);
}
else
if (effect.Handle == 0)
effect.Handle = ManagedBass.Bass.ChannelSetFX(Handle, effect.Effect.FXType, effect.Priority);

ManagedBass.Bass.FXSetParameters(effect.Handle, effect.Effect);
Expand Down