diff --git a/osu-framework b/osu-framework index fdcd1c5b50..f6f3c63b24 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit fdcd1c5b5036c7cc1d75abb605e225e7411d5742 +Subproject commit f6f3c63b244ab48a77801864d8a2fca20a9e7408 diff --git a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs index 5e8c0617fa..03743e7237 100644 --- a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs +++ b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs @@ -1,41 +1,41 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Graphics; using System.Collections.Generic; using System.Linq; -namespace osu.Game.Overlays.Options.Sections.Audio -{ - public class AudioDevicesOptions : OptionsSubsection - { - protected override string Header => "Devices"; - - private AudioManager audio; - - [BackgroundDependencyLoader] +namespace osu.Game.Overlays.Options.Sections.Audio +{ + public class AudioDevicesOptions : OptionsSubsection + { + protected override string Header => "Devices"; + + private AudioManager audio; + + [BackgroundDependencyLoader] private void load(AudioManager audio) { this.audio = audio; - } - + } + protected override void LoadComplete() { base.LoadComplete(); var deviceItems = new List>(); - deviceItems.Add(new KeyValuePair("Standard", "")); + deviceItems.Add(new KeyValuePair("Default", string.Empty)); deviceItems.AddRange(audio.GetDeviceNames().Select(d => new KeyValuePair(d, d))); - Children = new Drawable[] - { - new OptionDropDown() + Children = new Drawable[] + { + new OptionDropDown() { Items = deviceItems, Bindable = audio.AudioDevice - }, + }, }; - } - } + } + } } \ No newline at end of file