From 6add77c30bbfc83045677ce51a8028402e13ce87 Mon Sep 17 00:00:00 2001 From: default0 Date: Mon, 6 Feb 2017 12:26:32 +0100 Subject: [PATCH] Rename Standard device option to Default Changed the name of the option for using the default audio device to "Default" for consistency with english windows. Also changed the "" value to string.Empty for consistency with the Frameworks treatment of this special value. --- osu-framework | 2 +- .../Sections/Audio/AudioDevicesOptions.cs | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) 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