h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 15:22:55 +08:00
Code Issues Releases Wiki Activity

Separate files

Browse Source
This commit is contained in:
smoogipoo 2020-11-19 19:52:34 +09:00
parent 730b14b5bb
commit 003fed857c
3 changed files with 147 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Skinning/IPooledSampleProvider.cs Normal file
View File

@ -0,0 +1,14 @@
// 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.
using JetBrains.Annotations;
using osu.Game.Audio;
namespace osu.Game.Skinning
{
public interface IPooledSampleProvider
{
[CanBeNull]
PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo);
}
}

133
osu.Game/Skinning/PoolableSkinnableSample.cs Normal file
View File

@ -0,0 +1,133 @@
// 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.
using System;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Track;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Audio;
using osu.Game.Audio;
namespace osu.Game.Skinning
{
public class PoolableSkinnableSample : SkinReloadableDrawable, IAggregateAudioAdjustment, IAdjustableAudioComponent
{
private ISampleInfo sampleInfo;
private DrawableSample sample;
[Resolved]
private ISampleStore sampleStore { get; set; }
[Cached]
private readonly AudioAdjustments adjustments = new AudioAdjustments();
public PoolableSkinnableSample()
{
}
public PoolableSkinnableSample(ISampleInfo sampleInfo)
{
Apply(sampleInfo);
}
public void Apply(ISampleInfo sampleInfo)
{
if (this.sampleInfo != null)
throw new InvalidOperationException($"A {nameof(PoolableSkinnableSample)} cannot be applied multiple {nameof(ISampleInfo)}s.");
this.sampleInfo = sampleInfo;
if (LoadState >= LoadState.Ready)
updateSample();
}
protected override void SkinChanged(ISkinSource skin, bool allowFallback)
{
base.SkinChanged(skin, allowFallback);
updateSample();
}
private void updateSample()
{
ClearInternal();
var ch = CurrentSkin.GetSample(sampleInfo);
if (ch == null && AllowDefaultFallback)
{
foreach (var lookup in sampleInfo.LookupNames)
{
if ((ch = sampleStore.Get(lookup)) != null)
break;
}
}
if (ch == null)
return;
AddInternal(sample = new DrawableSample(ch)
{
Looping = Looping,
Volume = { Value = sampleInfo.Volume / 100.0 }
});
}
public void Play(bool restart = true) => sample?.Play(restart);
public void Stop() => sample?.Stop();
public bool Playing => sample?.Playing ?? false;
private bool looping;
public bool Looping
{
get => looping;
set
{
looping = value;
if (sample != null)
sample.Looping = value;
}
}
/// <summary>
/// The volume of this component.
/// </summary>
public BindableNumber<double> Volume => adjustments.Volume;
/// <summary>
/// The playback balance of this sample (-1 .. 1 where 0 is centered)
/// </summary>
public BindableNumber<double> Balance => adjustments.Balance;
/// <summary>
/// Rate at which the component is played back (affects pitch). 1 is 100% playback speed, or default frequency.
/// </summary>
public BindableNumber<double> Frequency => adjustments.Frequency;
/// <summary>
/// Rate at which the component is played back (does not affect pitch). 1 is 100% playback speed.
/// </summary>
public BindableNumber<double> Tempo => adjustments.Tempo;
public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
=> adjustments.AddAdjustment(type, adjustBindable);
public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
=> adjustments.RemoveAdjustment(type, adjustBindable);
public void RemoveAllAdjustments(AdjustableProperty type) => adjustments.RemoveAllAdjustments(type);
public IBindable<double> AggregateVolume => adjustments.AggregateVolume;
public IBindable<double> AggregateBalance => adjustments.AggregateBalance;
public IBindable<double> AggregateFrequency => adjustments.AggregateFrequency;
public IBindable<double> AggregateTempo => adjustments.AggregateTempo;
}
}

127
osu.Game/Skinning/SkinnableSound.cs
View File

@ -4,144 +4,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Track;
using osu.Framework.Bindables;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Audio;
using osu.Framework.Graphics.Containers;
using osu.Game.Audio;
namespace osu.Game.Skinning
{
public interface IPooledSampleProvider
{
[CanBeNull]
PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo);
}
public class PoolableSkinnableSample : SkinReloadableDrawable, IAggregateAudioAdjustment, IAdjustableAudioComponent
{
private ISampleInfo sampleInfo;
private DrawableSample sample;
[Resolved]
private ISampleStore sampleStore { get; set; }
[Cached]
private readonly AudioAdjustments adjustments = new AudioAdjustments();
public PoolableSkinnableSample()
{
}
public PoolableSkinnableSample(ISampleInfo sampleInfo)
{
Apply(sampleInfo);
}
public void Apply(ISampleInfo sampleInfo)
{
if (this.sampleInfo != null)
throw new InvalidOperationException($"A {nameof(PoolableSkinnableSample)} cannot be applied multiple {nameof(ISampleInfo)}s.");
this.sampleInfo = sampleInfo;
if (LoadState >= LoadState.Ready)
updateSample();
}
protected override void SkinChanged(ISkinSource skin, bool allowFallback)
{
base.SkinChanged(skin, allowFallback);
updateSample();
}
private void updateSample()
{
ClearInternal();
var ch = CurrentSkin.GetSample(sampleInfo);
if (ch == null && AllowDefaultFallback)
{
foreach (var lookup in sampleInfo.LookupNames)
{
if ((ch = sampleStore.Get(lookup)) != null)
break;
}
}
if (ch == null)
return;
AddInternal(sample = new DrawableSample(ch)
{
Looping = Looping,
Volume = { Value = sampleInfo.Volume / 100.0 }
});
}
public void Play(bool restart = true) => sample?.Play(restart);
public void Stop() => sample?.Stop();
public bool Playing => sample?.Playing ?? false;
private bool looping;
public bool Looping
{
get => looping;
set
{
looping = value;
if (sample != null)
sample.Looping = value;
}
}
/// <summary>
/// The volume of this component.
/// </summary>
public BindableNumber<double> Volume => adjustments.Volume;
/// <summary>
/// The playback balance of this sample (-1 .. 1 where 0 is centered)
/// </summary>
public BindableNumber<double> Balance => adjustments.Balance;
/// <summary>
/// Rate at which the component is played back (affects pitch). 1 is 100% playback speed, or default frequency.
/// </summary>
public BindableNumber<double> Frequency => adjustments.Frequency;
/// <summary>
/// Rate at which the component is played back (does not affect pitch). 1 is 100% playback speed.
/// </summary>
public BindableNumber<double> Tempo => adjustments.Tempo;
public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
=> adjustments.AddAdjustment(type, adjustBindable);
public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
=> adjustments.RemoveAdjustment(type, adjustBindable);
public void RemoveAllAdjustments(AdjustableProperty type) => adjustments.RemoveAllAdjustments(type);
public IBindable<double> AggregateVolume => adjustments.AggregateVolume;
public IBindable<double> AggregateBalance => adjustments.AggregateBalance;
public IBindable<double> AggregateFrequency => adjustments.AggregateFrequency;
public IBindable<double> AggregateTempo => adjustments.AggregateTempo;
}
public class SkinnableSound : SkinReloadableDrawable, IAdjustableAudioComponent
{
public override bool RemoveWhenNotAlive => false;