From 9c9f2df7a26190aa2e458a7ff6b2194b40583820 Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Mon, 22 Jul 2019 21:17:22 +0100
Subject: [PATCH] Fix acconfig

---
 A320-main.xml                                 | 19 ++++-----------
 AircraftConfig/acconfig.nas                   |  7 ++++++
 .../sound-config.xml                          | 24 ++++++++++++++-----
 3 files changed, 29 insertions(+), 21 deletions(-)
 rename {gui/dialogs => AircraftConfig}/sound-config.xml (79%)

diff --git a/A320-main.xml b/A320-main.xml
index b75ecad5..21c0a7a0 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -157,19 +157,6 @@
 			</autopilot>
 			<!-- 10 is sound -->
 		</systems>
-
-		<sound>
-			<wingview-aft type="bool">0</wingview-aft>
-			<wingview-fwd type="bool">0</wingview-fwd>
-			<internal-custom type="bool">0</internal-custom>
-			<suppress-warning type="bool">1</suppress-warning>
-			<exterior-volume type="double">1.0</exterior-volume>
-			<interior-volume type="double">1.0</interior-volume>
-			<wing-volume type="double">1.0</wing-volume>
-			<avionics-volume type="double">1.0</avionics-volume>
-			<effects-volume type="double">1.0</effects-volume>
-			<mechanical-volume type="double">1.0</mechanical-volume>
-		</sound>
 		
 		<sounde>
 			<seatbelt-sign type="bool">0</seatbelt-sign>
@@ -368,8 +355,10 @@
 					<item>
 						<label>Adjust Sound Volumes</label>
 						<binding>
-							<command>dialog-show</command>
-							<dialog-name>sound-config</dialog-name>
+							<command>nasal</command>
+							<script>
+							acconfig.sound_config_dlg.open();
+							</script>
 						</binding>
 					</item>
 					<item>
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index a7cfc47e..4d343f7a 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -93,6 +93,12 @@ setprop("/systems/acconfig/options/nd-rate", 1);
 setprop("/systems/acconfig/options/uecam-rate", 1);
 setprop("/systems/acconfig/options/lecam-rate", 1);
 setprop("/systems/acconfig/options/iesi-rate", 1);
+setprop("/systems/acconfig/options/sound/interior-volume", 1);
+setprop("/systems/acconfig/options/sound/exterior-volume", 1);
+setprop("/systems/acconfig/options/sound/wing-volume", 1);
+setprop("/systems/acconfig/options/sound/avionics-volume", 1);
+setprop("/systems/acconfig/options/sound/effects-volume", 1);
+setprop("/systems/acconfig/options/sound/mechanical-volume", 1);
 setprop("/systems/acconfig/options/autopush/show-route", 1);
 setprop("/systems/acconfig/options/autopush/show-wingtip", 1);
 var main_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/main/dialog", "Aircraft/IDG-A32X/AircraftConfig/main.xml");
@@ -110,6 +116,7 @@ var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dia
 var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/IDG-A32X/AircraftConfig/groundservices.xml");
 var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/IDG-A32X/AircraftConfig/du-quality.xml");
 var rendering_dlg = gui.Dialog.new("sim/gui/dialogs/rendering/dialog", "Aircraft/IDG-A32X/AircraftConfig/rendering.xml");
+var sound_config_dlg = gui.Dialog.new("sim/gui/dialogs/sound-config/dialog", "Aircraft/IDG-A32X/AircraftConfig/sound-config.xml");
 
 spinning.start();
 init_dlg.open();
diff --git a/gui/dialogs/sound-config.xml b/AircraftConfig/sound-config.xml
similarity index 79%
rename from gui/dialogs/sound-config.xml
rename to AircraftConfig/sound-config.xml
index 2ddd1b4a..0235400f 100644
--- a/gui/dialogs/sound-config.xml
+++ b/AircraftConfig/sound-config.xml
@@ -21,6 +21,12 @@
 			<pref-height>20</pref-height>
 			<legend>X</legend>
 			<key>Esc</key>
+			<binding>
+				<command>nasal</command>
+				<script>
+				acconfig.writeSettings();
+				</script>
+			</binding>
 			<binding>
 				<command>dialog-close</command>
 			</binding>
@@ -45,7 +51,7 @@
 		<slider>
 			<halign>left</halign>
 			<label>Cockpit Volume</label>
-			<property>/sim/sound/interior-volume</property>
+			<property>/systems/acconfig/options/sound/interior-volume</property>
 			<min>0.0</min>
 			<max>1.5</max>
 			<x>10</x>
@@ -59,7 +65,7 @@
 		<slider>
 			<halign>left</halign>
 			<label>Exterior Volume</label>
-			<property>/sim/sound/exterior-volume</property>
+			<property>/systems/acconfig/options/sound/exterior-volume</property>
 			<min>0.0</min>
 			<max>1.5</max>
 			<x>10</x>
@@ -74,7 +80,7 @@
 		<slider>
 			<halign>left</halign>
 			<label>Wing Volume</label>
-			<property>/sim/sound/wing-volume</property>
+			<property>/systems/acconfig/options/sound/wing-volume</property>
 			<min>0.0</min>
 			<max>1.5</max>
 			<x>10</x>
@@ -104,7 +110,7 @@
 		<slider>
 			<halign>left</halign>
 			<label>Avionics Volume</label>
-			<property>/sim/sound/avionics-volume</property>
+			<property>/systems/acconfig/options/sound/avionics-volume</property>
 			<min>0.0</min>
 			<max>1.5</max>
 			<x>10</x>
@@ -118,7 +124,7 @@
 		<slider>
 			<halign>left</halign>
 			<label>Effects Volume</label>
-			<property>/sim/sound/effects-volume</property>
+			<property>/systems/acconfig/options/sound/effects-volume</property>
 			<min>0.0</min>
 			<max>1.5</max>
 			<x>10</x>
@@ -133,7 +139,7 @@
 		<slider>
 			<halign>left</halign>
 			<label>Mechanical Volume</label>
-			<property>/sim/sound/mechanical-volume</property>
+			<property>/systems/acconfig/options/sound/mechanical-volume</property>
 			<min>0.0</min>
 			<max>1.5</max>
 			<x>10</x>
@@ -154,6 +160,12 @@
 			<halign>left</halign>
 			<legend>Close</legend>
 			<pref-width>210</pref-width>
+			<binding>
+				<command>nasal</command>
+				<script>
+				acconfig.writeSettings();
+				</script>
+			</binding>
 			<binding>
 				<command>dialog-close</command>
 			</binding>