diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index 5678ab4b..10c0e2e3 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -979,11 +979,13 @@ <mode>looped</mode> <path>Aircraft/IDG-A32X/Sounds/SASA/Cockpit_Roll.wav</path> <property>gear/gear[0]/wow</property> - <volume> <property>sim/sound/other/roll</property> <factor>1</factor> </volume> + <pitch> + <property>sim/sound/other/rollp</property> + </pitch> </roll> <roll> @@ -1003,11 +1005,13 @@ <mode>looped</mode> <path>Aircraft/IDG-A32X/Sounds/SASA/Cockpit_Roll.wav</path> <property>gear/gear[2]/wow</property> - <volume> <property>sim/sound/other/roll</property> <factor>1</factor> </volume> + <pitch> + <property>sim/sound/other/rollp</property> + </pitch> </roll> <detenta> diff --git a/Sounds/SASA/CFM56/A320_cockpit_idle_l.wav b/Sounds/SASA/CFM56/A320_cockpit_idle.wav similarity index 100% rename from Sounds/SASA/CFM56/A320_cockpit_idle_l.wav rename to Sounds/SASA/CFM56/A320_cockpit_idle.wav diff --git a/Sounds/SASA/CFM56/cfmidle-wingfwd.wav b/Sounds/SASA/CFM56/cfmidle-wingfwd.wav deleted file mode 100644 index 63311c8b..00000000 Binary files a/Sounds/SASA/CFM56/cfmidle-wingfwd.wav and /dev/null differ diff --git a/Sounds/cfm56-sound.xml b/Sounds/cfm56-sound.xml index e56c2936..84c69c41 100644 --- a/Sounds/cfm56-sound.xml +++ b/Sounds/cfm56-sound.xml @@ -519,7 +519,7 @@ <engine> <name>a320_internal_idle_left</name> <mode>looped</mode> - <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/cfmidle.wav</path> + <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/A320_cockpit_idle.wav</path> <condition> <property>/sim/sound/suppress-warning</property> </condition> @@ -541,7 +541,7 @@ <engine> <name>a320_internal_idle_right</name> <mode>looped</mode> - <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/cfmidle.wav</path> + <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/A320_cockpit_idle.wav</path> <condition> <property>/sim/sound/suppress-warning</property> </condition> @@ -563,7 +563,7 @@ <engine> <name>a320_internal_idle2_left</name> <mode>looped</mode> - <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/A320_cockpit_idle_l.wav</path> + <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/cfmidle.wav</path> <condition> <property>/sim/sound/suppress-warning</property> </condition> @@ -585,7 +585,7 @@ <engine> <name>a320_internal_idle2_right</name> <mode>looped</mode> - <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/A320_cockpit_idle_l.wav</path> + <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/cfmidle.wav</path> <condition> <property>/sim/sound/suppress-warning</property> </condition> @@ -738,6 +738,7 @@ <!-- internal sounds wing forward idle --> + <engine> <name>a320_internal_idle_left_wing</name> <mode>looped</mode> @@ -763,7 +764,7 @@ <engine> <name>a320_internal_idle_right_wing</name> <mode>looped</mode> - <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/cfmidle-wingfwd.wav</path> + <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/A320_cockpit_idle.wav</path> <condition> <property>/sim/sound/suppress-warning</property> </condition> @@ -783,12 +784,56 @@ </engine> <engine> - <name>a320_internal_idle_left_wing_aft</name> + <name>a320_internal_idle_left_wing</name> + <mode>looped</mode> + <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/A320_cockpit_idle.wav</path> + <condition> + <property>/sim/sound/suppress-warning</property> + </condition> + <volume> + <property>a320/sound/idle2-wing-fwd-left-v</property> + <offset>0</offset> + </volume> + <pitch> + <property>a320/sound/idle2-wing-fwd-left-p</property> + <offset>0</offset> + </pitch> + <position> + <x>00</x> + <y>20</y> + <z>00</z> + </position> + </engine> + + <engine> + <name>a320_internal_idle_right_wing</name> <mode>looped</mode> <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/cfmidle.wav</path> <condition> <property>/sim/sound/suppress-warning</property> </condition> + <volume> + <property>a320/sound/idle2-wing-fwd-right-v</property> + <offset>0</offset> + </volume> + <pitch> + <property>a320/sound/idle2-wing-fwd-right-p</property> + <offset>0</offset> + </pitch> + <position> + <x>00</x> + <y>-20</y> + <z>00</z> + </position> + </engine> + + <engine> + <name>a320_internal_idle_left_wing_aft</name> + <mode>looped</mode> + <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/A320_cockpit_idle.wav</path> + <condition> + <property>/sim/sound/suppress-warning</property> + </condition> <volume> <property>a320/sound/idle-wing-aft-left-v</property> <offset>0</offset> @@ -807,7 +852,7 @@ <engine> <name>a320_internal_idle_right_wing_aft</name> <mode>looped</mode> - <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/cfmidle-wingfwd.wav</path> + <path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/A320_cockpit_idle.wav</path> <condition> <property>/sim/sound/suppress-warning</property> </condition> diff --git a/Systems/cfm56-sound.xml b/Systems/cfm56-sound.xml index ed7df021..2f8d71d5 100644 --- a/Systems/cfm56-sound.xml +++ b/Systems/cfm56-sound.xml @@ -509,8 +509,8 @@ <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.06</ind> <dep>0.00</dep></entry> - <entry><ind>0.19</ind> <dep>0.40</dep></entry> - <entry><ind>0.45</ind> <dep>0.15</dep></entry> + <entry><ind>0.19</ind> <dep>0.60</dep></entry> + <entry><ind>0.45</ind> <dep>0.20</dep></entry> <entry><ind>0.55</ind> <dep>0.00</dep></entry> </table> </product> @@ -539,8 +539,8 @@ <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.06</ind> <dep>0.00</dep></entry> - <entry><ind>0.19</ind> <dep>0.40</dep></entry> - <entry><ind>0.45</ind> <dep>0.15</dep></entry> + <entry><ind>0.19</ind> <dep>0.60</dep></entry> + <entry><ind>0.45</ind> <dep>0.20</dep></entry> <entry><ind>0.55</ind> <dep>0.00</dep></entry> </table> </product> @@ -629,8 +629,9 @@ <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.06</ind> <dep>0.00</dep></entry> - <entry><ind>0.19</ind> <dep>0.05</dep></entry> - <entry><ind>0.32</ind> <dep>0.40</dep></entry> + <entry><ind>0.19</ind> <dep>0.00</dep></entry> + <entry><ind>0.22</ind> <dep>0.10</dep></entry> + <entry><ind>0.32</ind> <dep>0.50</dep></entry> <entry><ind>0.55</ind> <dep>0.00</dep></entry> </table> </product> @@ -659,8 +660,9 @@ <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.06</ind> <dep>0.00</dep></entry> - <entry><ind>0.19</ind> <dep>0.05</dep></entry> - <entry><ind>0.32</ind> <dep>0.40</dep></entry> + <entry><ind>0.19</ind> <dep>0.00</dep></entry> + <entry><ind>0.22</ind> <dep>0.10</dep></entry> + <entry><ind>0.32</ind> <dep>0.50</dep></entry> <entry><ind>0.55</ind> <dep>0.00</dep></entry> </table> </product> @@ -737,6 +739,124 @@ <!-- idle forward wing view --> +<filter> + <type>gain</type> + <gain>1</gain> + <input> + <condition> + <property>sim/current-view/internal</property> <!-- yes its meant to be this property --> + </condition> + <expression> + <product> + <table> + <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> + <entry><ind>0.06</ind> <dep>0.00</dep></entry> + <entry><ind>0.19</ind> <dep>0.05</dep></entry> + <entry><ind>0.32</ind> <dep>0.40</dep></entry> + <entry><ind>0.55</ind> <dep>0.00</dep></entry> + </table> + </product> + </expression> + </input> + <input> + <condition> + <not><property>sim/current-view/internal</property></not> + </condition> + <expression><value>0</value></expression> + </input> + <output> + <prop>a320/sound/idle2-wing-fwd-left-v</prop> + </output> +</filter> + +<filter> + <type>gain</type> + <gain>1</gain> + <input> + <condition> + <property>sim/current-view/internal</property> + </condition> + <expression> + <product> + <table> + <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> + <entry><ind>0.06</ind> <dep>0.00</dep></entry> + <entry><ind>0.19</ind> <dep>0.05</dep></entry> + <entry><ind>0.32</ind> <dep>0.40</dep></entry> + <entry><ind>0.55</ind> <dep>0.00</dep></entry> + </table> + </product> + </expression> + </input> + <input> + <condition> + <not><property>sim/current-view/internal</property></not> + </condition> + <expression><value>0</value></expression> + </input> + <output> + <prop>a320/sound/idle2-wing-fwd-right-v</prop> + </output> +</filter> + +<filter> + <type>gain</type> + <gain>1</gain> + <input> + <condition> + <property>sim/current-view/internal</property> + </condition> + <expression> + <product> + <table> + <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> + <entry><ind>0.15</ind> <dep>0.50</dep></entry> + <entry><ind>0.19</ind> <dep>1.00</dep></entry> + <entry><ind>0.50</ind> <dep>1.30</dep></entry> + </table> + </product> + </expression> + </input> + <input> + <condition> + <not><property>sim/current-view/internal</property></not> + </condition> + <expression><value>0</value></expression> + </input> + <output> + <prop>a320/sound/idle2-wing-fwd-left-p</prop> + </output> +</filter> + +<filter> + <type>gain</type> + <gain>1</gain> + <input> + <condition> + <property>sim/current-view/internal</property> + </condition> + <expression> + <product> + <table> + <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> + <entry><ind>0.15</ind> <dep>0.50</dep></entry> + <entry><ind>0.19</ind> <dep>1.00</dep></entry> + <entry><ind>0.50</ind> <dep>1.30</dep></entry> + </table> + </product> + </expression> + </input> + <input> + <condition> + <not><property>sim/current-view/internal</property></not> + </condition> + <expression><value>0</value></expression> + </input> + <output> + <prop>a320/sound/idle2-wing-fwd-right-p</prop> + </output> +</filter> + <filter> <type>gain</type> <gain>1</gain> @@ -996,9 +1116,9 @@ <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.00</dep></entry> - <entry><ind>0.19</ind> <dep>0.10</dep></entry> - <entry><ind>0.25</ind> <dep>0.20</dep></entry> - <entry><ind>0.42</ind> <dep>0.70</dep></entry> + <entry><ind>0.19</ind> <dep>0.00</dep></entry> + <entry><ind>0.25</ind> <dep>0.30</dep></entry> + <entry><ind>0.42</ind> <dep>0.80</dep></entry> <entry><ind>0.55</ind> <dep>0.20</dep></entry> <entry><ind>0.57</ind> <dep>0.00</dep></entry> </table> @@ -1028,9 +1148,9 @@ <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.00</dep></entry> - <entry><ind>0.19</ind> <dep>0.10</dep></entry> - <entry><ind>0.25</ind> <dep>0.20</dep></entry> - <entry><ind>0.42</ind> <dep>0.70</dep></entry> + <entry><ind>0.19</ind> <dep>0.00</dep></entry> + <entry><ind>0.25</ind> <dep>0.30</dep></entry> + <entry><ind>0.42</ind> <dep>0.80</dep></entry> <entry><ind>0.55</ind> <dep>0.20</dep></entry> <entry><ind>0.57</ind> <dep>0.00</dep></entry> </table> @@ -1426,7 +1546,7 @@ <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.32</ind> <dep>0.50</dep></entry> - <entry><ind>0.50</ind> <dep>1.10</dep></entry> + <entry><ind>0.50</ind> <dep>1.20</dep></entry> <entry><ind>0.99</ind> <dep>1.80</dep></entry> </table> </product> @@ -1455,7 +1575,7 @@ <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.32</ind> <dep>0.50</dep></entry> - <entry><ind>0.50</ind> <dep>1.10</dep></entry> + <entry><ind>0.50</ind> <dep>1.20</dep></entry> <entry><ind>0.99</ind> <dep>1.80</dep></entry> </table> </product> @@ -2196,8 +2316,9 @@ <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.32</ind> <dep>0.00</dep></entry> - <entry><ind>0.55</ind> <dep>0.01</dep></entry> - <entry><ind>0.65</ind> <dep>0.05</dep></entry> + <entry><ind>0.45</ind> <dep>0.05</dep></entry> + <entry><ind>0.55</ind> <dep>0.25</dep></entry> + <entry><ind>0.65</ind> <dep>0.30</dep></entry> <entry><ind>0.68</ind> <dep>0.35</dep></entry> <entry><ind>0.75</ind> <dep>0.60</dep></entry> <entry><ind>0.99</ind> <dep>0.65</dep></entry> @@ -2228,8 +2349,9 @@ <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.32</ind> <dep>0.00</dep></entry> - <entry><ind>0.55</ind> <dep>0.01</dep></entry> - <entry><ind>0.65</ind> <dep>0.05</dep></entry> + <entry><ind>0.45</ind> <dep>0.05</dep></entry> + <entry><ind>0.55</ind> <dep>0.25</dep></entry> + <entry><ind>0.65</ind> <dep>0.30</dep></entry> <entry><ind>0.68</ind> <dep>0.35</dep></entry> <entry><ind>0.75</ind> <dep>0.60</dep></entry> <entry><ind>0.99</ind> <dep>0.65</dep></entry> @@ -2818,10 +2940,10 @@ <product> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> - <entry><ind>0.65</ind> <dep>0.00</dep></entry> - <entry><ind>0.70</ind> <dep>0.10</dep></entry> - <entry><ind>0.90</ind> <dep>0.40</dep></entry> - <entry><ind>1.02</ind> <dep>0.50</dep></entry> + <entry><ind>0.60</ind> <dep>0.00</dep></entry> + <entry><ind>0.70</ind> <dep>0.30</dep></entry> + <entry><ind>0.90</ind> <dep>0.60</dep></entry> + <entry><ind>1.02</ind> <dep>0.70</dep></entry> </table> </product> </expression> @@ -2848,10 +2970,10 @@ <product> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> - <entry><ind>0.65</ind> <dep>0.00</dep></entry> - <entry><ind>0.70</ind> <dep>0.10</dep></entry> - <entry><ind>0.90</ind> <dep>0.40</dep></entry> - <entry><ind>1.02</ind> <dep>0.50</dep></entry> + <entry><ind>0.60</ind> <dep>0.00</dep></entry> + <entry><ind>0.70</ind> <dep>0.30</dep></entry> + <entry><ind>0.90</ind> <dep>0.60</dep></entry> + <entry><ind>1.02</ind> <dep>0.70</dep></entry> </table> </product> </expression> @@ -3615,10 +3737,11 @@ <product> <table> <product><property>/velocities/groundspeed-kt</property><value>1</value> </product> - <entry><ind>0.00</ind> <dep>0.001</dep></entry> + <entry><ind>0.00</ind> <dep>0.0001</dep></entry> + <entry><ind>10</ind> <dep>0.001</dep></entry> <entry><ind>100</ind> <dep>0.01</dep></entry> - <entry><ind>200</ind> <dep>0.10</dep></entry> - <entry><ind>450</ind> <dep>0.40</dep></entry> + <entry><ind>250</ind> <dep>0.10</dep></entry> + <entry><ind>550</ind> <dep>0.30</dep></entry> </table> <property>sim/sound/internal-custom</property> </product> @@ -3637,8 +3760,8 @@ <product> <table> <product><property>/velocities/groundspeed-kt</property><value>1</value> </product> - <entry><ind>0.00</ind> <dep>1.00</dep></entry> - <entry><ind>450</ind> <dep>2.00</dep></entry> + <entry><ind>0.00</ind> <dep>0.50</dep></entry> + <entry><ind>550</ind> <dep>1.00</dep></entry> </table> <property>sim/sound/internal-custom</property> </product> @@ -3662,9 +3785,9 @@ <property>/velocities/groundspeed-kt</property> <value>1</value> </product> - <entry><ind>001</ind> <dep>0.00</dep></entry> + <entry><ind>010</ind> <dep>0.00</dep></entry> <entry><ind>110</ind> <dep>0.50</dep></entry> - <entry><ind>130</ind> <dep>0.70</dep></entry> + <entry><ind>140</ind> <dep>1.00</dep></entry> </table> </expression> </input> @@ -3679,6 +3802,35 @@ </output> </filter> +<filter> + <type>gain</type> + <gain>1</gain> + <input> + <condition> + <property>sim/sound/internal-custom</property> + </condition> + <expression> + <table> + <product> + <property>/velocities/groundspeed-kt</property> + <value>1</value> + </product> + <entry><ind>010</ind> <dep>0.50</dep></entry> + <entry><ind>140</ind> <dep>1.00</dep></entry> + </table> + </expression> + </input> + <input> + <condition> + <not><property>sim/sound/internal-custom</property></not> + </condition> + <value>0</value> + </input> + <output> + <prop>sim/sound/other/rollp</prop> + </output> +</filter> + <filter> <type>gain</type> <gain>1</gain>