From d9e1e59af703eb6c4d852bf62542c38afd8a0dba Mon Sep 17 00:00:00 2001
From: Maxim Ivanov <imginimg@gmail.com>
Date: Fri, 17 Dec 2021 15:42:05 +0300
Subject: [PATCH] [AudioSystem] ACE: Added "File -> Refresh Audio System"
 action (same as "Game -> Refresh Audio") with "Ctrl-Shift-R" shortcut.

Signed-off-by: Maxim Ivanov <imginimg@gmail.com>
---
 .../Editor/AudioControlsEditorMainWindow.ui   | 25 +++++++++++++++++++
 .../Editor/AudioControlsEditorWindow.cpp      | 24 +++++++++++-------
 .../Source/Editor/AudioControlsEditorWindow.h |  1 +
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorMainWindow.ui b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorMainWindow.ui
index 352e1bdf78..7a1f4793b8 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorMainWindow.ui
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorMainWindow.ui
@@ -143,6 +143,7 @@
     </property>
     <addaction name="actionSaveAll"/>
     <addaction name="actionReload"/>
+    <addaction name="actionRefreshAudioSystem"/>
    </widget>
    <addaction name="menuFile"/>
   </widget>
@@ -170,6 +171,14 @@
     <string>Ctrl+R</string>
    </property>
   </action>
+  <action name="actionRefreshAudioSystem">
+   <property name="text">
+    <string>Refresh Audio System</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+R</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="AudioControlsEditorUI.qrc"/>
@@ -207,6 +216,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionRefreshAudioSystem</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>RefreshAudioSystem()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>485</x>
+     <y>336</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <signal>CurrentControlNameChanged(QString)</signal>
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
index 5f870d06d4..35b1f3f2c8 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
@@ -198,6 +198,20 @@ namespace AudioControls
         }
     }
 
+    //-------------------------------------------------------------------------------------------//
+    void CAudioControlsEditorWindow::RefreshAudioSystem()
+    {
+        QString sLevelName = GetIEditor()->GetLevelName();
+
+        if (QString::compare(sLevelName, "Untitled", Qt::CaseInsensitive) == 0)
+        {
+            // Rather pass empty QString to indicate that no level is loaded!
+            sLevelName = QString();
+        }
+
+        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::RefreshAudioSystem, sLevelName.toUtf8().data());
+    }
+
     //-------------------------------------------------------------------------------------------//
     void CAudioControlsEditorWindow::Save()
     {
@@ -215,15 +229,7 @@ namespace AudioControls
             messageBox.setWindowTitle("Audio Controls Editor");
             if (messageBox.exec() == QMessageBox::Yes)
             {
-                QString sLevelName = GetIEditor()->GetLevelName();
-
-                if (QString::compare(sLevelName, "Untitled", Qt::CaseInsensitive) == 0)
-                {
-                    // Rather pass empty QString to indicate that no level is loaded!
-                    sLevelName = QString();
-                }
-
-                Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::RefreshAudioSystem, sLevelName.toUtf8().data());
+                RefreshAudioSystem();
             }
         }
         m_pATLModel->ClearDirtyFlags();
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
index 00ffabfbe9..43d0ed8c8e 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
@@ -61,6 +61,7 @@ namespace AudioControls
         void UpdateInspector();
         void FilterControlType(EACEControlType type, bool bShow);
         void Update();
+        void RefreshAudioSystem();
 
     protected:
         void closeEvent(QCloseEvent* pEvent) override;