sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-04-29 02:37:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename the nullable disable annotation in the Audio namespace and mark some properties as nullable.

Browse Source
This commit is contained in:
andy840119 2022-07-31 22:00:14 +08:00
parent 998e3b74d6
commit 6c964dee30
8 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Audio/Effects/AudioFilter.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using System.Diagnostics; using System.Diagnostics;
using ManagedBass.Fx; using ManagedBass.Fx;
using osu.Framework.Audio.Mixing; using osu.Framework.Audio.Mixing;

2
osu.Game/Audio/Effects/ITransformableFilter.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Transforms; using osu.Framework.Graphics.Transforms;

2
osu.Game/Audio/IPreviewTrackOwner.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
namespace osu.Game.Audio namespace osu.Game.Audio
{ {
/// <summary> /// <summary>

2
osu.Game/Audio/ISampleInfo.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using System.Collections.Generic; using System.Collections.Generic;
namespace osu.Game.Audio namespace osu.Game.Audio

2
osu.Game/Audio/ISamplePlaybackDisabler.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Game.Skinning; using osu.Game.Skinning;

6
osu.Game/Audio/PreviewTrack.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using System; using System;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Audio.Track; using osu.Framework.Audio.Track;
@ -18,13 +16,13 @@ namespace osu.Game.Audio
/// Invoked when this <see cref="PreviewTrack"/> has stopped playing. /// Invoked when this <see cref="PreviewTrack"/> has stopped playing.
/// Not invoked in a thread-safe context. /// Not invoked in a thread-safe context.
/// </summary> /// </summary>
public event Action Stopped; public event Action? Stopped;
/// <summary> /// <summary>
/// Invoked when this <see cref="PreviewTrack"/> has started playing. /// Invoked when this <see cref="PreviewTrack"/> has started playing.
/// Not invoked in a thread-safe context. /// Not invoked in a thread-safe context.
/// </summary> /// </summary>
public event Action Started; public event Action? Started;
protected Track Track { get; private set; } protected Track Track { get; private set; }

8
osu.Game/Audio/PreviewTrackManager.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Audio; using osu.Framework.Audio;
using osu.Framework.Audio.Track; using osu.Framework.Audio.Track;
@ -20,9 +18,9 @@ namespace osu.Game.Audio
private readonly BindableDouble muteBindable = new BindableDouble(); private readonly BindableDouble muteBindable = new BindableDouble();
private ITrackStore trackStore; private ITrackStore trackStore = null!;
protected TrackManagerPreviewTrack CurrentTrack; protected TrackManagerPreviewTrack? CurrentTrack;
public PreviewTrackManager(IAdjustableAudioComponent mainTrackAdjustments) public PreviewTrackManager(IAdjustableAudioComponent mainTrackAdjustments)
{ {
@ -90,7 +88,7 @@ namespace osu.Game.Audio
public class TrackManagerPreviewTrack : PreviewTrack public class TrackManagerPreviewTrack : PreviewTrack
{ {
[Resolved(canBeNull: true)] [Resolved(canBeNull: true)]
public IPreviewTrackOwner Owner { get; private set; } public IPreviewTrackOwner? Owner { get; private set; }
private readonly IBeatmapSetInfo beatmapSetInfo; private readonly IBeatmapSetInfo beatmapSetInfo;
private readonly ITrackStore trackManager; private readonly ITrackStore trackManager;

4
osu.Game/Audio/SampleInfo.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@ -34,7 +32,7 @@ namespace osu.Game.Audio
Volume); Volume);
} }
public bool Equals(SampleInfo other) public bool Equals(SampleInfo? other)
=> other != null && sampleNames.SequenceEqual(other.sampleNames); => other != null && sampleNames.SequenceEqual(other.sampleNames);
public override bool Equals(object obj) public override bool Equals(object obj)