diff --git a/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj b/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj
index 7873f6303..076eba9bd 100644
--- a/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj
+++ b/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs b/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs
index 47bae6a20..49b0356c7 100644
--- a/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs
@@ -17,10 +17,9 @@ public KaraokeFramedReplayInputHandler(Replay replay)
protected override bool IsImportant(KaraokeReplayFrame frame) => frame.Sound;
- public override List GetPendingInputs() => new List
+ public override void CollectPendingInputs(List inputs)
{
- new ReplayState
- {
+ inputs.Add(new ReplayState {
PressedActions = CurrentFrame?.Sound ?? false
? new List
{
@@ -30,7 +29,7 @@ public KaraokeFramedReplayInputHandler(Replay replay)
}
}
: new List()
- }
- };
+ });
+ }
}
}
diff --git a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeInternalSkin.cs b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeInternalSkin.cs
index ff51a61ab..72d78200a 100644
--- a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeInternalSkin.cs
+++ b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeInternalSkin.cs
@@ -7,6 +7,7 @@
using osu.Framework.Audio.Sample;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
+using osu.Framework.Graphics.OpenGL.Textures;
using osu.Framework.Graphics.Textures;
using osu.Game.Audio;
using osu.Game.IO;
@@ -45,7 +46,7 @@ public KaraokeInternalSkin()
public SampleChannel GetSample(ISampleInfo sampleInfo) => null;
- public Texture GetTexture(string componentName) => null;
+ public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
public IBindable GetConfig(TLookup lookup)
{
diff --git a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeLegacySkinTransformer.cs b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeLegacySkinTransformer.cs
index c5cef3196..e6c93c1ad 100644
--- a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeLegacySkinTransformer.cs
@@ -17,7 +17,7 @@
namespace osu.Game.Rulesets.Karaoke.Skinning
{
- public class KaraokeLegacySkinTransformer : ISkin
+ public class KaraokeLegacySkinTransformer : LegacySkinTransformer
{
private readonly ISkin source;
@@ -34,6 +34,7 @@ public class KaraokeLegacySkinTransformer : ISkin
private Lazy isLegacySkin;
public KaraokeLegacySkinTransformer(ISkinSource source)
+ : base(source)
{
this.source = source;
@@ -73,7 +74,7 @@ private void sourceChanged()
isLegacySkin = new Lazy(() => source?.GetConfig(LegacySkinConfiguration.LegacySetting.Version) != null);
}
- public Drawable GetDrawableComponent(ISkinComponent component)
+ public override Drawable GetDrawableComponent(ISkinComponent component)
{
if (!(component is KaraokeSkinComponent karaokeComponent))
return null;
@@ -126,11 +127,7 @@ private bool textureExist(params string[] textureNames)
private bool animationExist(params string[] textureNames)
=> textureNames.All(x => source.GetAnimation(x, true, false) != null);
- public Texture GetTexture(string componentName) => source.GetTexture(componentName);
-
- public SampleChannel GetSample(ISampleInfo sample) => source.GetSample(sample);
-
- public IBindable GetConfig(TLookup lookup)
+ public override IBindable GetConfig(TLookup lookup)
{
switch (lookup)
{
diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
index 08a02807d..6634510b9 100644
--- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
+++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -12,7 +12,7 @@
-
+