From 32ce8cf72356b5730992f6bc3853f6e3a6e46462 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 18 Feb 2017 17:35:04 +0900 Subject: [PATCH] Audio class renames in line with framework changes. --- osu-framework | 2 +- osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs | 2 +- osu.Game/Beatmaps/WorkingBeatmap.cs | 6 +++--- osu.Game/Graphics/UserInterface/OsuCheckbox.cs | 4 ++-- osu.Game/Graphics/UserInterface/OsuSliderBar.cs | 2 +- osu.Game/Graphics/UserInterface/TwoLayerButton.cs | 2 +- osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs | 2 +- osu.Game/Overlays/Pause/PauseButton.cs | 2 +- osu.Game/Overlays/Toolbar/ToolbarButton.cs | 2 +- osu.Game/Screens/Menu/Button.cs | 2 +- osu.Game/Screens/Menu/ButtonSystem.cs | 2 +- osu.Game/Screens/Menu/Intro.cs | 6 +++--- osu.Game/Screens/Menu/OsuLogo.cs | 2 +- osu.Game/Screens/Play/Player.cs | 2 +- osu.Game/Screens/Select/PlaySongSelect.cs | 6 +++--- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/osu-framework b/osu-framework index b62e49ecb0..3f0753c62c 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit b62e49ecb06c4a5b6fb304568e03b0689a8bdac3 +Subproject commit 3f0753c62c82532bbb384e4e3726dcdb715a0614 diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs index 7380871583..47ffe513c1 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs @@ -53,7 +53,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables }; } - private AudioSample sample; + private SampleChannel sample; [BackgroundDependencyLoader] private void load(AudioManager audio) diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs index 62223ec879..676bf2821b 100644 --- a/osu.Game/Beatmaps/WorkingBeatmap.cs +++ b/osu.Game/Beatmaps/WorkingBeatmap.cs @@ -83,9 +83,9 @@ namespace osu.Game.Beatmaps } private ArchiveReader trackReader; - private AudioTrack track; + private Track track; private object trackLock = new object(); - public AudioTrack Track + public Track Track { get { @@ -99,7 +99,7 @@ namespace osu.Game.Beatmaps trackReader = getReader(); var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile); if (trackData != null) - track = new AudioTrackBass(trackData); + track = new TrackBass(trackData); } catch { } diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs index 206b0dc09d..b05d005a1b 100644 --- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs +++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs @@ -71,8 +71,8 @@ namespace osu.Game.Graphics.UserInterface private Nub nub; private SpriteText labelSpriteText; - private AudioSample sampleChecked; - private AudioSample sampleUnchecked; + private SampleChannel sampleChecked; + private SampleChannel sampleUnchecked; public OsuCheckbox() { diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs index 229d510688..63c8749f00 100644 --- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs +++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs @@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface { public class OsuSliderBar : SliderBar where U : struct { - private AudioSample sample; + private SampleChannel sample; private double lastSampleTime; private Nub nub; diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs index 54277bd7ff..294d8533e4 100644 --- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs +++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs @@ -28,7 +28,7 @@ namespace osu.Game.Graphics.UserInterface public static readonly Vector2 SIZE_EXTENDED = new Vector2(140, 50); public static readonly Vector2 SIZE_RETRACTED = new Vector2(100, 50); - public AudioSample ActivationSound; + public SampleChannel ActivationSound; private SpriteText text; public Color4 HoverColour; diff --git a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs index 94369d51aa..173176d8b4 100644 --- a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs +++ b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs @@ -54,7 +54,7 @@ namespace osu.Game.Modes.Objects.Drawables } } - AudioSample sample; + SampleChannel sample; [BackgroundDependencyLoader] private void load(AudioManager audio) diff --git a/osu.Game/Overlays/Pause/PauseButton.cs b/osu.Game/Overlays/Pause/PauseButton.cs index 1a1ba4f527..08ded6fbd1 100644 --- a/osu.Game/Overlays/Pause/PauseButton.cs +++ b/osu.Game/Overlays/Pause/PauseButton.cs @@ -55,7 +55,7 @@ namespace osu.Game.Overlays.Pause } } - public AudioSample SampleClick, SampleHover; + public SampleChannel SampleClick, SampleHover; private Container backgroundContainer, colourContainer, glowContainer; private Box leftGlow, centerGlow, rightGlow; diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs index 1b8e68151c..8b8010821d 100644 --- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs +++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs @@ -66,7 +66,7 @@ namespace osu.Game.Overlays.Toolbar private SpriteText tooltip1; private SpriteText tooltip2; protected FlowContainer Flow; - private AudioSample sampleClick; + private SampleChannel sampleClick; public ToolbarButton() { diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs index 14d957733a..0c4c6fc1e8 100644 --- a/osu.Game/Screens/Menu/Button.cs +++ b/osu.Game/Screens/Menu/Button.cs @@ -37,7 +37,7 @@ namespace osu.Game.Screens.Menu private readonly float extraWidth; private Key triggerKey; private string text; - private AudioSample sampleClick; + private SampleChannel sampleClick; public override bool Contains(Vector2 screenSpacePos) { diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs index fe3a45d33a..8464ca92ef 100644 --- a/osu.Game/Screens/Menu/ButtonSystem.cs +++ b/osu.Game/Screens/Menu/ButtonSystem.cs @@ -32,7 +32,7 @@ namespace osu.Game.Screens.Menu public Action OnChart; public Action OnTest; - private AudioSample sampleOsuClick; + private SampleChannel sampleOsuClick; private Toolbar toolbar; diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index 91a1bd33f7..c69dfff7db 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -24,9 +24,9 @@ namespace osu.Game.Screens.Menu internal bool DidLoadMenu; MainMenu mainMenu; - private AudioSample welcome; - private AudioSample seeya; - private AudioTrack bgm; + private SampleChannel welcome; + private SampleChannel seeya; + private Track bgm; internal override bool ShowOverlays => false; diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs index 3a1a37fdcc..2035ec17ce 100644 --- a/osu.Game/Screens/Menu/OsuLogo.cs +++ b/osu.Game/Screens/Menu/OsuLogo.cs @@ -33,7 +33,7 @@ namespace osu.Game.Screens.Menu private Container logoBounceContainer; private Container logoHoverContainer; - private AudioSample sampleClick; + private SampleChannel sampleClick; private Container colourAndTriangles; diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 87f07b2766..23341ec0d4 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -89,7 +89,7 @@ namespace osu.Game.Screens.Play return; } - AudioTrack track = Beatmap.Track; + Track track = Beatmap.Track; if (track != null) { diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 3b36c86731..706a71b2b6 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -47,8 +47,8 @@ namespace osu.Game.Screens.Select private static readonly Vector2 background_blur = new Vector2(20); private CancellationTokenSource initialAddSetsTask; - private AudioSample sampleChangeDifficulty; - private AudioSample sampleChangeBeatmap; + private SampleChannel sampleChangeDifficulty; + private SampleChannel sampleChangeBeatmap; private List beatmapGroups; @@ -317,7 +317,7 @@ namespace osu.Game.Screens.Select private void ensurePlayingSelected(bool preview = false) { - AudioTrack track = Beatmap?.Track; + Track track = Beatmap?.Track; if (track != null) {