Merge pull request #345 from Tom94/audio-options

Audio options

osu.Game/Overlays/MusicController.cs

@@ -240,7 +240,6 @@ protected override void Update()
 
             if (current?.TrackLoaded ?? false)
             {
-
                 progress.UpdatePosition((float)(current.Track.CurrentTime / current.Track.Length));
                 playButton.Icon = current.Track.IsRunning ? FontAwesome.fa_pause_circle_o : FontAwesome.fa_play_circle_o;
 

osu.Game/Overlays/Options/OptionDropDown.cs

@@ -71,7 +71,14 @@ public IEnumerable<KeyValuePair<string, T>> Items
             {
                 items = value;
                 if(dropdown != null)
+                {
                     dropdown.Items = value;
+
+                    // We need to refresh the dropdown because our items changed,
+                    // thus its selected value may be outdated.
+                    if (bindable != null)
+                        dropdown.SelectedValue = bindable.Value;
+                }
             }
         }
 

osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs

@@ -14,28 +14,53 @@ public class AudioDevicesOptions : OptionsSubsection
         protected override string Header => "Devices";
 
         private AudioManager audio;
+        private OptionDropDown<string> dropdown;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
             this.audio = audio;
         }
 
-        protected override void LoadComplete()
+        protected override void Dispose(bool isDisposing)
         {
-            base.LoadComplete();
+            base.Dispose(isDisposing);
+
+            audio.OnNewDevice -= onDeviceChanged;
+            audio.OnLostDevice -= onDeviceChanged;
+        }
 
+        private void updateItems()
+        {
             var deviceItems = new List<KeyValuePair<string, string>>();
             deviceItems.Add(new KeyValuePair<string, string>("Default", string.Empty));
-            deviceItems.AddRange(audio.GetDeviceNames().Select(d => new KeyValuePair<string, string>(d, d)));
+            deviceItems.AddRange(audio.AudioDeviceNames.Select(d => new KeyValuePair<string, string>(d, d)));
+
+            var preferredDeviceName = audio.AudioDevice.Value;
+            if (!deviceItems.Any(kv => kv.Value == preferredDeviceName))
+                deviceItems.Add(new KeyValuePair<string, string>(preferredDeviceName, preferredDeviceName));
+
+            dropdown.Items = deviceItems;
+        }
+
+        private void onDeviceChanged(string name) => updateItems();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
             Children = new Drawable[]
             {
-                new OptionDropDown<string>()
+                dropdown = new OptionDropDown<string>()
                 {
-                    Items = deviceItems,
                     Bindable = audio.AudioDevice
                 },
             };
+
+            updateItems();
+
+            audio.OnNewDevice += onDeviceChanged;
+            audio.OnLostDevice += onDeviceChanged;
         }
     }
 }