sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Audio class renames in line with framework changes.

Browse Source
This commit is contained in:
Dean Herbert
2017-02-18 17:35:04 +09:00
parent 7a29603800
commit 32ce8cf723
15 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: b62e49ecb0...3f0753c62c

2
osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
}; };
} }
private AudioSample sample; private SampleChannel sample;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio) private void load(AudioManager audio)

6
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -83,9 +83,9 @@ namespace osu.Game.Beatmaps
} }
private ArchiveReader trackReader; private ArchiveReader trackReader;
private AudioTrack track; private Track track;
private object trackLock = new object(); private object trackLock = new object();
public AudioTrack Track public Track Track
{ {
get get
{ {
@ -99,7 +99,7 @@ namespace osu.Game.Beatmaps
trackReader = getReader(); trackReader = getReader();
var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile); var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
if (trackData != null) if (trackData != null)
track = new AudioTrackBass(trackData); track = new TrackBass(trackData);
} }
catch { } catch { }

4
osu.Game/Graphics/UserInterface/OsuCheckbox.cs
View File

@ -71,8 +71,8 @@ namespace osu.Game.Graphics.UserInterface
private Nub nub; private Nub nub;
private SpriteText labelSpriteText; private SpriteText labelSpriteText;
private AudioSample sampleChecked; private SampleChannel sampleChecked;
private AudioSample sampleUnchecked; private SampleChannel sampleUnchecked;
public OsuCheckbox() public OsuCheckbox()
{ {

2
osu.Game/Graphics/UserInterface/OsuSliderBar.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
public class OsuSliderBar<U> : SliderBar<U> where U : struct public class OsuSliderBar<U> : SliderBar<U> where U : struct
{ {
private AudioSample sample; private SampleChannel sample;
private double lastSampleTime; private double lastSampleTime;
private Nub nub; private Nub nub;

2
osu.Game/Graphics/UserInterface/TwoLayerButton.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Graphics.UserInterface
public static readonly Vector2 SIZE_EXTENDED = new Vector2(140, 50); public static readonly Vector2 SIZE_EXTENDED = new Vector2(140, 50);
public static readonly Vector2 SIZE_RETRACTED = new Vector2(100, 50); public static readonly Vector2 SIZE_RETRACTED = new Vector2(100, 50);
public AudioSample ActivationSound; public SampleChannel ActivationSound;
private SpriteText text; private SpriteText text;
public Color4 HoverColour; public Color4 HoverColour;

2
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
View File

@ -54,7 +54,7 @@ namespace osu.Game.Modes.Objects.Drawables
} }
} }
AudioSample sample; SampleChannel sample;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio) private void load(AudioManager audio)

2
osu.Game/Overlays/Pause/PauseButton.cs
View File

@ -55,7 +55,7 @@ namespace osu.Game.Overlays.Pause
} }
} }
public AudioSample SampleClick, SampleHover; public SampleChannel SampleClick, SampleHover;
private Container backgroundContainer, colourContainer, glowContainer; private Container backgroundContainer, colourContainer, glowContainer;
private Box leftGlow, centerGlow, rightGlow; private Box leftGlow, centerGlow, rightGlow;

2
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -66,7 +66,7 @@ namespace osu.Game.Overlays.Toolbar
private SpriteText tooltip1; private SpriteText tooltip1;
private SpriteText tooltip2; private SpriteText tooltip2;
protected FlowContainer Flow; protected FlowContainer Flow;
private AudioSample sampleClick; private SampleChannel sampleClick;
public ToolbarButton() public ToolbarButton()
{ {

2
osu.Game/Screens/Menu/Button.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Screens.Menu
private readonly float extraWidth; private readonly float extraWidth;
private Key triggerKey; private Key triggerKey;
private string text; private string text;
private AudioSample sampleClick; private SampleChannel sampleClick;
public override bool Contains(Vector2 screenSpacePos) public override bool Contains(Vector2 screenSpacePos)
{ {

2
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Menu
public Action OnChart; public Action OnChart;
public Action OnTest; public Action OnTest;
private AudioSample sampleOsuClick; private SampleChannel sampleOsuClick;
private Toolbar toolbar; private Toolbar toolbar;

6
osu.Game/Screens/Menu/Intro.cs
View File

@ -24,9 +24,9 @@ namespace osu.Game.Screens.Menu
internal bool DidLoadMenu; internal bool DidLoadMenu;
MainMenu mainMenu; MainMenu mainMenu;
private AudioSample welcome; private SampleChannel welcome;
private AudioSample seeya; private SampleChannel seeya;
private AudioTrack bgm; private Track bgm;
internal override bool ShowOverlays => false; internal override bool ShowOverlays => false;

2
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Screens.Menu
private Container logoBounceContainer; private Container logoBounceContainer;
private Container logoHoverContainer; private Container logoHoverContainer;
private AudioSample sampleClick; private SampleChannel sampleClick;
private Container colourAndTriangles; private Container colourAndTriangles;

2
osu.Game/Screens/Play/Player.cs
View File

@ -89,7 +89,7 @@ namespace osu.Game.Screens.Play
return; return;
} }
AudioTrack track = Beatmap.Track; Track track = Beatmap.Track;
if (track != null) if (track != null)
{ {

6
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -47,8 +47,8 @@ namespace osu.Game.Screens.Select
private static readonly Vector2 background_blur = new Vector2(20); private static readonly Vector2 background_blur = new Vector2(20);
private CancellationTokenSource initialAddSetsTask; private CancellationTokenSource initialAddSetsTask;
private AudioSample sampleChangeDifficulty; private SampleChannel sampleChangeDifficulty;
private AudioSample sampleChangeBeatmap; private SampleChannel sampleChangeBeatmap;
private List<BeatmapGroup> beatmapGroups; private List<BeatmapGroup> beatmapGroups;
@ -317,7 +317,7 @@ namespace osu.Game.Screens.Select
private void ensurePlayingSelected(bool preview = false) private void ensurePlayingSelected(bool preview = false)
{ {
AudioTrack track = Beatmap?.Track; Track track = Beatmap?.Track;
if (track != null) if (track != null)
{ {