Further refactoring / reorganizing

Tkael · Tkael · commit 03b6ac975925 · 2025-05-24T13:04:29.000-07:00
diff --git a/SpeechResponder/CustomFunctions/Humanise.cs b/SpeechResponder/CustomFunctions/Humanise.cs
@@ -1,6 +1,6 @@
 ﻿using Cottle;
 using EddiSpeechResponder.ScriptResolverService;
-using EddiSpeechService;
+using EddiSpeechService.SpeechConversions;
 using JetBrains.Annotations;
 using System;
 
@@ -13,6 +13,6 @@ public class Humanise : ICustomFunction
         public FunctionCategory Category => FunctionCategory.Utility;
         public string description => Properties.CustomFunctions_Untranslated.Humanise;
         public Type ReturnType => typeof( string );
-        public IFunction function => Function.CreateNative1( ( runtime, input, writer ) => Translations.Humanize( (decimal?)Convert.ToDecimal( input.AsNumber ) ) );
+        public IFunction function => Function.CreateNative1( ( runtime, input, writer ) => SpeechConversions.Humanize( (decimal?)Convert.ToDecimal( input.AsNumber ) ) );
     }
 }
diff --git a/SpeechResponder/CustomFunctions/ICAO.cs b/SpeechResponder/CustomFunctions/ICAO.cs
@@ -1,6 +1,6 @@
 ﻿using Cottle;
 using EddiSpeechResponder.ScriptResolverService;
-using EddiSpeechService;
+using EddiSpeechService.SpeechConversions;
 using JetBrains.Annotations;
 using System;
 
@@ -20,7 +20,7 @@ public class ICAO : ICustomFunction
             if (string.IsNullOrEmpty(value)) { return ""; }
 
             // Translate to ICAO, removing anything that isn't alphanumeric
-            return Translations.ICAO( value.ToUpperInvariant().Replace( "[^A-Z0-9]", "" ) );
+            return SpeechConversions.ICAO( value.ToUpperInvariant().Replace( "[^A-Z0-9]", "" ) );
         });
     }
 }
diff --git a/SpeechResponder/CustomFunctions/P.cs b/SpeechResponder/CustomFunctions/P.cs
@@ -1,6 +1,7 @@
 ﻿using Cottle;
 using EddiSpeechResponder.ScriptResolverService;
 using EddiSpeechService;
+using EddiSpeechService.SpeechConversions;
 using JetBrains.Annotations;
 using System;
 
@@ -18,7 +19,7 @@ public class P : ICustomFunction
             var val = values[0].AsString;
             var type = values.Count > 1 ? values[1].AsString : null;
             var useICAO = SpeechServiceConfiguration.FromFile().EnableIcao;
-            return Translations.GetTranslation(val, useICAO, type);
+            return SpeechConversions.GetTranslation(val, useICAO, type);
         }, 1, 2);
     }
 }
diff --git a/SpeechResponder/CustomFunctions/ShipCallsign.cs b/SpeechResponder/CustomFunctions/ShipCallsign.cs
@@ -3,7 +3,7 @@
 using EddiCore;
 using EddiDataDefinitions;
 using EddiSpeechResponder.ScriptResolverService;
-using EddiSpeechService;
+using EddiSpeechService.SpeechConversions;
 using JetBrains.Annotations;
 using System;
 using System.Linq;
@@ -102,7 +102,7 @@ internal static string phoneticCallsign(Ship ship, string id)
         private static string Get3LeadingCharacters(string input)
         {
             // Obtain the first three characters of the input string, zero padded and converted to ICAO (e.g. "A" becomes "Alpha Zero Zero")
-            return Translations.ICAO(new Regex("[^a-zA-Z0-9]")
+            return SpeechConversions.ICAO(new Regex("[^a-zA-Z0-9]")
                 .Replace(input, "")
                 .ToUpperInvariant()
                 .PadRight(3, '0')
diff --git a/SpeechResponder/CustomFunctions/Spacialise.cs b/SpeechResponder/CustomFunctions/Spacialise.cs
@@ -1,6 +1,7 @@
 ﻿using Cottle;
 using EddiSpeechResponder.ScriptResolverService;
 using EddiSpeechService;
+using EddiSpeechService.SpeechConversions;
 using JetBrains.Annotations;
 using System;
 
@@ -17,7 +18,7 @@ public class Spacialise : ICustomFunction
         {
             if ( string.IsNullOrEmpty( input.AsString ) ) { return ""; }
             var useICAO = SpeechServiceConfiguration.FromFile().EnableIcao;
-            return Translations.sayAsLettersOrNumbers( input.AsString, false, useICAO );
+            return SpeechConversions.sayAsLettersOrNumbers( input.AsString, false, useICAO );
         });
     }
 }
diff --git a/SpeechService/SpeechConversions/Humanize.cs b/SpeechService/SpeechConversions/Humanize.cs
@@ -2,9 +2,9 @@
 using System.Globalization;
 using Utilities;
 
-namespace EddiSpeechService
+namespace EddiSpeechService.SpeechConversions
 {
-    public static partial class Translations
+    public static partial class SpeechConversions
     {
         /// <summary>
         /// Present a number's approximate value in a format suitable for text-to-speech
diff --git a/SpeechService/SpeechConversions/PhoneticBody.cs b/SpeechService/SpeechConversions/PhoneticBody.cs
@@ -1,9 +1,9 @@
 ﻿using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace EddiSpeechService
+namespace EddiSpeechService.SpeechConversions
 {
-    public static partial class Translations
+    public static partial class SpeechConversions
     {
         /// <summary>Fix up body names</summary>
         private static string getPhoneticBody(string body, bool useICAO = false)
diff --git a/SpeechService/SpeechConversions/PhoneticFaction.cs b/SpeechService/SpeechConversions/PhoneticFaction.cs
@@ -1,8 +1,8 @@
 ﻿using System.Collections.Generic;
 
-namespace EddiSpeechService
+namespace EddiSpeechService.SpeechConversions
 {
-    public static partial class Translations
+    public static partial class SpeechConversions
     {
         // Fixes to avoid issues with some of the more strangely-named factions
         private static readonly Dictionary<string, string> FACTION_FIXES = new Dictionary<string, string>()
diff --git a/SpeechService/SpeechConversions/PhoneticPlanetClass.cs b/SpeechService/SpeechConversions/PhoneticPlanetClass.cs
@@ -1,8 +1,8 @@
 ﻿using EddiDataDefinitions;
 
-namespace EddiSpeechService
+namespace EddiSpeechService.SpeechConversions
 {
-    public static partial class Translations
+    public static partial class SpeechConversions
     {
         public static string getPhoneticPlanetClass(string val)
         {
diff --git a/SpeechService/SpeechConversions/PhoneticPower.cs b/SpeechService/SpeechConversions/PhoneticPower.cs
@@ -1,6 +1,6 @@
-﻿namespace EddiSpeechService
+﻿namespace EddiSpeechService.SpeechConversions
 {
-    public static partial class Translations
+    public static partial class SpeechConversions
     {
         /// <summary>Fix up power names</summary>
         public static string getPhoneticPower(string power)
diff --git a/SpeechService/SpeechConversions/PhoneticShipManufacturer.cs b/SpeechService/SpeechConversions/PhoneticShipManufacturer.cs
@@ -1,8 +1,8 @@
 ﻿using EddiDataDefinitions;
 
-namespace EddiSpeechService
+namespace EddiSpeechService.SpeechConversions
 {
-    public static partial class Translations
+    public static partial class SpeechConversions
     {
         public static string getPhoneticShipManufacturer(string val2)
         {
diff --git a/SpeechService/SpeechConversions/PhoneticShipModel.cs b/SpeechService/SpeechConversions/PhoneticShipModel.cs
@@ -1,8 +1,8 @@
 ﻿using EddiDataDefinitions;
 
-namespace EddiSpeechService
+namespace EddiSpeechService.SpeechConversions
 {
-    public static partial class Translations
+    public static partial class SpeechConversions
     {
         public static string getPhoneticShipModel(string val)
         {
diff --git a/SpeechService/SpeechConversions/PhoneticStarSystem.cs b/SpeechService/SpeechConversions/PhoneticStarSystem.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace EddiSpeechService
+namespace EddiSpeechService.SpeechConversions
 {
-    public static partial class Translations
+    public static partial class SpeechConversions
     {
         // Fixes to avoid issues with some of the more strangely-named systems
         private static readonly Dictionary<string, string> STAR_SYSTEM_FIXES = new Dictionary<string, string>()
diff --git a/SpeechService/SpeechConversions/PhoneticStation.cs b/SpeechService/SpeechConversions/PhoneticStation.cs
@@ -1,8 +1,8 @@
 ﻿using System.Collections.Generic;
 
-namespace EddiSpeechService
+namespace EddiSpeechService.SpeechConversions
 {
-    public static partial class Translations
+    public static partial class SpeechConversions
     {
         // Fixes to avoid issues with pronunciation of station model names
         private static readonly Dictionary<string, string> STATION_MODEL_FIXES = new Dictionary<string, string>()
diff --git a/SpeechService/SpeechConversions/SpeechConversions.cs b/SpeechService/SpeechConversions/SpeechConversions.cs
@@ -3,10 +3,10 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace EddiSpeechService
+namespace EddiSpeechService.SpeechConversions
 {
     /// <summary>Translations for Elite items for text-to-speech</summary>
-    public static partial class Translations
+    public static partial class SpeechConversions
     {
         public static string GetTranslation(string val, bool useICAO = false, string type = null)
         {
diff --git a/SpeechService/SpeechEffects/FXParameters.cs b/SpeechService/SpeechEffects/FXParameters.cs
diff --git a/SpeechService/SpeechEffects/SpeechFX.cs b/SpeechService/SpeechEffects/SpeechFX.cs
@@ -10,7 +10,7 @@
 
 namespace EddiSpeechService.SpeechEffects
 {
-    public static class SpeechFX
+    public static class SpeechFx
     {
         public static IWaveProvider addEffectsToSource ( Stream stream, int targetVolume, int fxLevel, int distortionLevel, int echoDelay, bool radio )
         {
@@ -30,32 +30,23 @@ public static IWaveProvider addEffectsToSource ( Stream stream, int targetVolume
 
                 var signal = new DiscreteSignal( source.WaveFormat.SampleRate, trimmedBuffer );
                 var sampleRate = source.WaveFormat.SampleRate;
-                var damageAdjustedFxLevel = FxParameters.DamageAdjustedFxLevel( distortionLevel, fxLevel );
+                var damageAdjustedFxLevel = DamageAdjustedFxLevel( distortionLevel, fxLevel );
 
                 Logging.Debug( $"Effects level is {damageAdjustedFxLevel}, echo delay is {echoDelay}" );
 
-                var resolvedReverbLevel = 0;
-
-                // Chorus - We always apply chorus effects.
+                // Chorus
                 signal = ApplyChorus(signal, damageAdjustedFxLevel, sampleRate, out var resolvedChorusLevel);
 
-                // Radio (highpass)
-                if ( radio )
-                {
-                    signal = ApplyRadio(signal, sampleRate);
-                }
-                // We only have distortion, echo, and reverb if we're not transmitting or receiving
-                else
-                {
-                    // Echo
-                    signal = ApplyEcho( signal, echoDelay, sampleRate );
+                // Reverb
+                signal = ApplyReverb( signal, damageAdjustedFxLevel, sampleRate, out var resolvedReverbLevel );
 
-                    // Reverb
-                    signal = ApplyReverb( signal, damageAdjustedFxLevel, sampleRate, out resolvedReverbLevel );
+                // Distortion
+                signal = ApplyDamageDistortion( signal, distortionLevel );
 
-                    // Distortion (apply last)
-                    signal = ApplyDamageDistortion( signal, distortionLevel );
-                }
+                // Either apply a radio effect or an echo effect as appropriate
+                signal = radio 
+                    ? ApplyRadio(signal, sampleRate) 
+                    : ApplyEcho( signal, echoDelay, sampleRate );
 
                 signal = new DiscreteSignal( signal.SamplingRate, NormalizeSamples( signal, targetVolume ) );
 
@@ -82,6 +73,18 @@ public static IWaveProvider addEffectsToSource ( Stream stream, int targetVolume
             }
         }
 
+        private static int DamageAdjustedFxLevel ( decimal distortionLevel, int configFxLevel )
+        {
+            // Effects level can be increased, e.g. by damage if distortion is enabled
+            var bonusFX = 0;
+            if ( distortionLevel > 0 )
+            {
+                bonusFX = (int)decimal.Round( distortionLevel / 100M * ( 100M - configFxLevel ) );
+            }
+
+            return configFxLevel + bonusFX;
+        }
+
         private static DiscreteSignal ApplyChorus ( DiscreteSignal signal, int damageAdjustedFxLevel, int sampleRate, out int resolvedChorusLevel )
         {
             resolvedChorusLevel = (int)( 60 * ( damageAdjustedFxLevel / 100M ) );
diff --git a/SpeechService/SpeechService.cs b/SpeechService/SpeechService.cs
@@ -388,7 +388,7 @@ public void Speak ( string speech, string defaultVoice, int fxLevel, int volume
                     Logging.Debug("Seeking back to the beginning of the stream");
                     stream.Seek(0, SeekOrigin.Begin);
 
-                    var provider = SpeechFX.addEffectsToSource(stream, volume, fxLevel, distortionLevel, echoDelay, isRadio );
+                    var provider = SpeechFx.addEffectsToSource(stream, volume, fxLevel, distortionLevel, echoDelay, isRadio );
                     PlaySpeechStreamAsync( provider, priority ).GetAwaiter().GetResult();
                 }
             }
diff --git a/Tests/HumanizeTests.cs b/Tests/HumanizeTests.cs
@@ -1,4 +1,4 @@
-﻿using EddiSpeechService;
+﻿using EddiSpeechService.SpeechConversions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Tests
@@ -9,7 +9,7 @@ public class HumanizeTests
         [TestMethod]
         public void TestNullInput()
         {
-            Assert.IsNull(Translations.Humanize(null));
+            Assert.IsNull(SpeechConversions.Humanize(null));
         }
 
         [DataTestMethod]
@@ -24,7 +24,7 @@ public void TestNullInput()
         [DataRow(-1999001, "nearly minus 2 million")]
         public void TestIntToFloatingMantissa(int number, string expected)
         {
-            Assert.AreEqual(expected, Translations.Humanize(number, false));
+            Assert.AreEqual(expected, SpeechConversions.Humanize(number, false));
         }
 
         [DataTestMethod]
@@ -51,7 +51,7 @@ public void TestIntToFloatingMantissa(int number, string expected)
         [DataRow(-1999001, "nearly minus 2 million")]
         public void TestIntToIntegerMantissa(int number, string expected)
         {
-            Assert.AreEqual(expected, Translations.Humanize(number, true));
+            Assert.AreEqual(expected, SpeechConversions.Humanize(number, true));
         }
 
         [DataTestMethod]
@@ -71,7 +71,7 @@ public void TestIntToIntegerMantissa(int number, string expected)
         [DataRow(9.1235E17, "over 912 quadrillion")]
         public void TestDoubleToFloatingMantissa(double number, string expected)
         {
-            Assert.AreEqual(expected, Translations.Humanize((decimal)number, false));
+            Assert.AreEqual(expected, SpeechConversions.Humanize((decimal)number, false));
         }
 
         [DataTestMethod]
@@ -91,7 +91,7 @@ public void TestDoubleToFloatingMantissa(double number, string expected)
         [DataRow(9.1235E17, "over 912 quadrillion")]
         public void TestDoubleToIntegerMantissa(double number, string expected)
         {
-            Assert.AreEqual(expected, Translations.Humanize((decimal)number, true));
+            Assert.AreEqual(expected, SpeechConversions.Humanize((decimal)number, true));
         }
 
         [DataTestMethod]
@@ -106,7 +106,7 @@ public void TestDoubleToIntegerMantissa(double number, string expected)
         [DataRow(1999001, "nearly 2 million")]
         public void Test2ndDigitRangePositive(int number, string expected)
         {
-            Assert.AreEqual(expected, Translations.Humanize(number, false));
+            Assert.AreEqual(expected, SpeechConversions.Humanize(number, false));
         }
 
         [DataTestMethod]
@@ -121,7 +121,7 @@ public void Test2ndDigitRangePositive(int number, string expected)
         [DataRow(-1999001, "nearly minus 2 million")]
         public void Test2ndDigitRangeNegative(int number, string expected)
         {
-            Assert.AreEqual(expected, Translations.Humanize(number, false));
+            Assert.AreEqual(expected, SpeechConversions.Humanize(number, false));
         }
 
         [DataTestMethod]
@@ -131,7 +131,7 @@ public void Test2ndDigitRangeNegative(int number, string expected)
         [DataRow(111700, "nearly 112 thousand")]
         public void TestNumbersWith3DigitMantissa(int number, string expected)
         {
-            Assert.AreEqual(expected, Translations.Humanize(number, false));
+            Assert.AreEqual(expected, SpeechConversions.Humanize(number, false));
         }
     }
 }
diff --git a/Tests/SpeechTests.cs b/Tests/SpeechTests.cs
diff --git a/Tests/SpeechUnitTests.cs b/Tests/SpeechUnitTests.cs
diff --git a/Tests/TranslationTests.cs b/Tests/TranslationTests.cs
diff --git a/VoiceAttackResponder/VoiceAttackVariables.cs b/VoiceAttackResponder/VoiceAttackVariables.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Cottle;`
`2`	`2`	`using EddiSpeechResponder.ScriptResolverService;`
`3`		`-using EddiSpeechService;`
	`3`	`+using EddiSpeechService.SpeechConversions;`
`4`	`4`	`using JetBrains.Annotations;`
`5`	`5`	`using System;`
`6`	`6`
`@@ -13,6 +13,6 @@ public class Humanise : ICustomFunction`
`13`	`13`	`public FunctionCategory Category => FunctionCategory.Utility;`
`14`	`14`	`public string description => Properties.CustomFunctions_Untranslated.Humanise;`
`15`	`15`	`public Type ReturnType => typeof( string );`
`16`		`- public IFunction function => Function.CreateNative1( ( runtime, input, writer ) => Translations.Humanize( (decimal?)Convert.ToDecimal( input.AsNumber ) ) );`
	`16`	`+ public IFunction function => Function.CreateNative1( ( runtime, input, writer ) => SpeechConversions.Humanize( (decimal?)Convert.ToDecimal( input.AsNumber ) ) );`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using Cottle;`
`2`	`2`	`using EddiSpeechResponder.ScriptResolverService;`
`3`	`3`	`using EddiSpeechService;`
	`4`	`+using EddiSpeechService.SpeechConversions;`
`4`	`5`	`using JetBrains.Annotations;`
`5`	`6`	`using System;`
`6`	`7`
`@@ -17,7 +18,7 @@ public class Spacialise : ICustomFunction`
`17`	`18`	`{`
`18`	`19`	`if ( string.IsNullOrEmpty( input.AsString ) ) { return ""; }`
`19`	`20`	`var useICAO = SpeechServiceConfiguration.FromFile().EnableIcao;`
`20`		`- return Translations.sayAsLettersOrNumbers( input.AsString, false, useICAO );`
	`21`	`+ return SpeechConversions.sayAsLettersOrNumbers( input.AsString, false, useICAO );`
`21`	`22`	`});`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`using System.Globalization;`
`3`	`3`	`using Utilities;`
`4`	`4`
`5`		`-namespace EddiSpeechService`
	`5`	`+namespace EddiSpeechService.SpeechConversions`
`6`	`6`	`{`
`7`		`- public static partial class Translations`
	`7`	`+ public static partial class SpeechConversions`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// Present a number's approximate value in a format suitable for text-to-speech`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.Text.RegularExpressions;`
`3`	`3`
`4`		`-namespace EddiSpeechService`
	`4`	`+namespace EddiSpeechService.SpeechConversions`
`5`	`5`	`{`
`6`		`- public static partial class Translations`
	`6`	`+ public static partial class SpeechConversions`
`7`	`7`	`{`
`8`	`8`	`/// <summary>Fix up body names</summary>`
`9`	`9`	`private static string getPhoneticBody(string body, bool useICAO = false)`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`
`3`		`-namespace EddiSpeechService`
	`3`	`+namespace EddiSpeechService.SpeechConversions`
`4`	`4`	`{`
`5`		`- public static partial class Translations`
	`5`	`+ public static partial class SpeechConversions`
`6`	`6`	`{`
`7`	`7`	`// Fixes to avoid issues with some of the more strangely-named factions`
`8`	`8`	`private static readonly Dictionary<string, string> FACTION_FIXES = new Dictionary<string, string>()`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using EddiDataDefinitions;`
`2`	`2`
`3`		`-namespace EddiSpeechService`
	`3`	`+namespace EddiSpeechService.SpeechConversions`
`4`	`4`	`{`
`5`		`- public static partial class Translations`
	`5`	`+ public static partial class SpeechConversions`
`6`	`6`	`{`
`7`	`7`	`public static string getPhoneticPlanetClass(string val)`
`8`	`8`	`{`