From 9e3d8b0b6dbb0b89a6c8e320b563a4fda615be54 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 10 Feb 2017 20:11:20 +1300
Subject: [PATCH] Move the audio devices list into the root audio dialog

---
 scripts/system/selectAudioDevice.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/system/selectAudioDevice.js b/scripts/system/selectAudioDevice.js
index c618909e8c..3f3b160630 100644
--- a/scripts/system/selectAudioDevice.js
+++ b/scripts/system/selectAudioDevice.js
@@ -52,8 +52,7 @@ var selectedInputMenu = "";
 var selectedOutputMenu = "";
 
 function setupAudioMenus() {
-    Menu.addMenu("Audio > Devices");
-    Menu.addSeparator("Audio > Devices","Output Audio Device");
+    Menu.addSeparator("Audio", "Output Audio Device");
 
     var outputDeviceSetting = Settings.getValue(OUTPUT_DEVICE_SETTING);
     var outputDevices = AudioDevice.getOutputDevices();
@@ -68,7 +67,7 @@ function setupAudioMenus() {
         var thisDeviceSelected = (outputDevices[i] == selectedOutputDevice);
         var menuItem = "Use " + outputDevices[i] + " for Output";
         Menu.addMenuItem({
-                            menuName: "Audio > Devices",
+                            menuName: "Audio",
                             menuItemName: menuItem,
                             isCheckable: true,
                             isChecked: thisDeviceSelected
@@ -78,7 +77,7 @@ function setupAudioMenus() {
         }
     }
 
-    Menu.addSeparator("Audio > Devices","Input Audio Device");
+    Menu.addSeparator("Audio", "Input Audio Device");
 
     var inputDeviceSetting = Settings.getValue(INPUT_DEVICE_SETTING);
     var inputDevices = AudioDevice.getInputDevices();
@@ -93,7 +92,7 @@ function setupAudioMenus() {
         var thisDeviceSelected = (inputDevices[i] == selectedInputDevice);
         var menuItem = "Use " + inputDevices[i] + " for Input";
         Menu.addMenuItem({
-                            menuName: "Audio > Devices",
+                            menuName: "Audio",
                             menuItemName: menuItem,
                             isCheckable: true,
                             isChecked: thisDeviceSelected