RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-08 20:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Standard device option to Default

Browse Source 
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.
This commit is contained in:
default0 2017-02-06 12:26:32 +01:00
parent ae03ef0787
commit 6add77c30b
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit fdcd1c5b5036c7cc1d75abb605e225e7411d5742 Subproject commit f6f3c63b244ab48a77801864d8a2fca20a9e7408

42
osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
View File

@ -1,41 +1,41 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>. //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Audio; using osu.Framework.Audio;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
namespace osu.Game.Overlays.Options.Sections.Audio namespace osu.Game.Overlays.Options.Sections.Audio
{ {
public class AudioDevicesOptions : OptionsSubsection public class AudioDevicesOptions : OptionsSubsection
{ {
protected override string Header => "Devices"; protected override string Header => "Devices";
private AudioManager audio; private AudioManager audio;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio) private void load(AudioManager audio)
{ {
this.audio = audio; this.audio = audio;
} }
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
var deviceItems = new List<KeyValuePair<string, string>>(); var deviceItems = new List<KeyValuePair<string, string>>();
deviceItems.Add(new KeyValuePair<string, string>("Standard", "")); deviceItems.Add(new KeyValuePair<string, string>("Default", string.Empty));
deviceItems.AddRange(audio.GetDeviceNames().Select(d => new KeyValuePair<string, string>(d, d))); deviceItems.AddRange(audio.GetDeviceNames().Select(d => new KeyValuePair<string, string>(d, d)));
Children = new Drawable[] Children = new Drawable[]
{ {
new OptionDropDown<string>() new OptionDropDown<string>()
{ {
Items = deviceItems, Items = deviceItems,
Bindable = audio.AudioDevice Bindable = audio.AudioDevice
}, },
}; };
} }
} }
} }