Changes to localization handling on client side. Will need to do more cleanup.

Author: SineVector241

Tooling/README.md

@@ -4,6 +4,7 @@
 using Android.Media;
 using VoiceCraft.Core;
 using VoiceCraft.Core.Interfaces;
+using VoiceCraft.Core.Locales;
 using AudioFormat = Android.Media.AudioFormat;
 
 namespace VoiceCraft.Client.Android.Audio;
@@ -38,7 +39,8 @@ public AudioPlayer(AudioManager audioManager, int sampleRate, int channels, Core
 
     public AudioContentType ContentType { get; set; } = AudioContentType.Music;
 
-    public int SessionId => _nativePlayer?.AudioSessionId ?? throw new InvalidOperationException(Locales.Locales.Audio_Player_Init);
+    public int SessionId => _nativePlayer?.AudioSessionId ??
+                            throw new InvalidOperationException(Localizer.Get("Audio.Player.Init"));
 
     //Public Properties
     public int SampleRate
@@ -47,7 +49,8 @@ public int SampleRate
         set
         {
             if (value < 0)
-                throw new ArgumentOutOfRangeException(nameof(value), value, "Sample rate must be greater than or equal to zero!");
+                throw new ArgumentOutOfRangeException(nameof(value), value,
+                    "Sample rate must be greater than or equal to zero!");
 
             _sampleRate = value;
         }
@@ -59,7 +62,8 @@ public int Channels
         set
         {
             if (value < 1)
-                throw new ArgumentOutOfRangeException(nameof(value), value, "Channels must be greater than or equal to one!");
+                throw new ArgumentOutOfRangeException(nameof(value), value,
+                    "Channels must be greater than or equal to one!");
 
             _channels = value;
         }
@@ -87,7 +91,8 @@ public int BufferMilliseconds
         set
         {
             if (value < 0)
-                throw new ArgumentOutOfRangeException(nameof(value), value, "Buffer milliseconds must be greater than or equal to zero!");
+                throw new ArgumentOutOfRangeException(nameof(value), value,
+                    "Buffer milliseconds must be greater than or equal to zero!");
 
             _bufferMilliseconds = value;
         }
@@ -110,7 +115,7 @@ public void Initialize(Func<byte[], int, int> playerCallback)
 
             //Check if already playing.
             if (PlaybackState != PlaybackState.Stopped)
-                throw new InvalidOperationException(Locales.Locales.Audio_Player_InitFailed);
+                throw new InvalidOperationException(Localizer.Get("Audio.Player.InitFailed"));
 
             //Cleanup previous player.
             CleanupPlayer();
@@ -132,37 +137,41 @@ public void Initialize(Func<byte[], int, int> playerCallback)
                 2 => ChannelOut.Stereo,
                 _ => throw new NotSupportedException()
             };
-            
+
             //Determine the buffer size
             var blockAlign = Channels * (BitDepth / 8);
             var bytesPerSecond = _sampleRate * blockAlign;
 
             var audioAttributes = new AudioAttributes.Builder().SetUsage(Usage)?.SetContentType(ContentType)?.Build();
-            var audioFormat = new AudioFormat.Builder().SetEncoding(encoding)?.SetSampleRate(SampleRate)?.SetChannelMask(channelMask).Build();
+            var audioFormat = new AudioFormat.Builder().SetEncoding(encoding)?.SetSampleRate(SampleRate)
+                ?.SetChannelMask(channelMask).Build();
 
             if (audioAttributes == null || audioFormat == null)
                 throw new InvalidOperationException();
 
             //Calculate total buffer bytes.
             var totalBufferBytes = (int)(bytesPerSecond / 1000.0 * BufferMilliseconds);
-            if (totalBufferBytes % blockAlign != 0) totalBufferBytes = totalBufferBytes + blockAlign - totalBufferBytes % blockAlign;
-            totalBufferBytes = Math.Max(totalBufferBytes, AudioTrack.GetMinBufferSize(SampleRate, channelMask, encoding));
+            if (totalBufferBytes % blockAlign != 0)
+                totalBufferBytes = totalBufferBytes + blockAlign - totalBufferBytes % blockAlign;
+            totalBufferBytes = Math.Max(totalBufferBytes,
+                AudioTrack.GetMinBufferSize(SampleRate, channelMask, encoding));
 
             _nativePlayer = new AudioTrack.Builder().SetAudioAttributes(audioAttributes).SetAudioFormat(audioFormat)
                 .SetBufferSizeInBytes(totalBufferBytes).SetTransferMode(AudioTrackMode.Stream).Build();
-            
+
             _bufferBytes = (_nativePlayer.BufferSizeInFrames + NumberOfBuffers - 1) / NumberOfBuffers * blockAlign;
             _bufferBytes = (_bufferBytes + 3) & ~3;
             _byteBuffer = new byte[_bufferBytes];
             _shortBuffer = new short[_bufferBytes / sizeof(short)];
             _floatBuffer = new float[_bufferBytes / sizeof(float)];
-            
+
             if (_nativePlayer.State != AudioTrackState.Initialized)
-                throw new InvalidOperationException(Locales.Locales.Audio_Player_InitFailed);
+                throw new InvalidOperationException(Localizer.Get("Audio.Player.InitFailed"));
 
             _nativePlayer.SetVolume(1.0f);
             var selectedDevice = _audioManager.GetDevices(GetDevicesTargets.Outputs)
-                ?.FirstOrDefault(x => $"{x.ProductName.Truncate(8)} - {x.Type}" == SelectedDevice);
+                ?.FirstOrDefault(x =>
+                    x.ProductName != null && $"{x.ProductName.Truncate(8)} - {x.Type}" == SelectedDevice);
             _nativePlayer.SetPreferredDevice(selectedDevice);
         }
         catch
@@ -295,7 +304,7 @@ private void ThrowIfDisposed()
     private void ThrowIfNotInitialized()
     {
         if (_nativePlayer == null)
-            throw new InvalidOperationException(Locales.Locales.Audio_Player_Init);
+            throw new InvalidOperationException(Localizer.Get("Audio.Player.Init"));
     }
 
     private void Resume()
@@ -385,7 +394,7 @@ private void PlaybackLogic()
                     throw new ArgumentOutOfRangeException();
             }
         }
-        
+
         _nativePlayer?.Flush();
     }
 

Tooling/adbStarter.sh

@@ -4,6 +4,7 @@
 using Android.Media;
 using VoiceCraft.Core;
 using VoiceCraft.Core.Interfaces;
+using VoiceCraft.Core.Locales;
 using AudioFormat = VoiceCraft.Core.AudioFormat;
 
 namespace VoiceCraft.Client.Android.Audio;
@@ -34,7 +35,7 @@ public AudioRecorder(AudioManager audioManager, int sampleRate, int channels, Au
 
     public AudioSource AudioSource { get; set; } = AudioSource.VoiceCommunication;
 
-    public int SessionId => _nativeRecorder?.AudioSessionId ?? throw new InvalidOperationException(Locales.Locales.Audio_Recorder_Init);
+    public int SessionId => _nativeRecorder?.AudioSessionId ?? throw new InvalidOperationException(Localizer.Get("Audio.Player.Init"));
 
     //Public Properties
     public int SampleRate
@@ -106,7 +107,7 @@ public void Initialize()
             ThrowIfDisposed();
 
             if (CaptureState != CaptureState.Stopped)
-                throw new InvalidOperationException(Locales.Locales.Audio_Recorder_InitFailed);
+                throw new InvalidOperationException(Localizer.Get("Audio.Player.InitFailed"));
 
             //Cleanup previous recorder.
             CleanupRecorder();
@@ -141,7 +142,7 @@ public void Initialize()
             //Create the AudioRecord Object.
             _nativeRecorder = new AudioRecord(AudioSource, SampleRate, channelMask, encoding, _bufferBytes);
             if (_nativeRecorder.State != State.Initialized)
-                throw new InvalidOperationException(Locales.Locales.Audio_Recorder_InitFailed);
+                throw new InvalidOperationException(Localizer.Get("Audio.Player.InitFailed"));
 
             var device = _audioManager.GetDevices(GetDevicesTargets.Inputs)
                 ?.FirstOrDefault(x => $"{x.ProductName.Truncate(8)} - {x.Type}" == SelectedDevice);
@@ -240,7 +241,7 @@ private void ThrowIfDisposed()
     private void ThrowIfNotInitialized()
     {
         if (_nativeRecorder == null)
-            throw new InvalidOperationException(Locales.Locales.Audio_Recorder_Init);
+            throw new InvalidOperationException(Localizer.Get("Audio.Player.Init"));
     }
 
     private void InvokeDataAvailable(byte[] buffer, int bytesRecorded)

Tooling/adbStopper.sh

@@ -1,6 +1,7 @@
 using System;
 using Android.Media.Audiofx;
 using VoiceCraft.Core.Interfaces;
+using VoiceCraft.Core.Locales;
 
 namespace VoiceCraft.Client.Android.Audio;
 
@@ -16,13 +17,13 @@ public void Initialize(IAudioRecorder recorder)
         ThrowIfDisposed();
 
         if (recorder is not AudioRecorder audioRecorder)
-            throw new InvalidOperationException(Locales.Locales.Audio_AGC_InitFailed);
+            throw new InvalidOperationException(Localizer.Get("Audio.AGC.InitFailed"));
 
         CleanupGainController();
         _gainController = AutomaticGainControl.Create(audioRecorder.SessionId);
 
         if (_gainController == null || _gainController.SetEnabled(true) != AudioEffectStatus.Success)
-            throw new InvalidOperationException(Locales.Locales.Audio_AEC_InitFailed);
+            throw new InvalidOperationException(Localizer.Get("Audio.AGC.InitFailed"));
     }
 
     public void Process(byte[] buffer)
@@ -63,7 +64,7 @@ private void ThrowIfDisposed()
     private void ThrowIfNotInitialized()
     {
         if (_gainController == null)
-            throw new InvalidOperationException(Locales.Locales.Audio_AGC_Init);
+            throw new InvalidOperationException(Localizer.Get("Audio.AGC.Init"));
     }
 
     private void Dispose(bool disposing)

VoiceCraft.Client/VoiceCraft.Client.Android/Audio/AudioPlayer.cs

@@ -1,6 +1,7 @@
 using System;
 using Android.Media.Audiofx;
 using VoiceCraft.Core.Interfaces;
+using VoiceCraft.Core.Locales;
 
 namespace VoiceCraft.Client.Android.Audio;
 
@@ -15,13 +16,13 @@ public void Initialize(IAudioRecorder recorder)
         ThrowIfDisposed();
 
         if (recorder is not AudioRecorder audioRecorder)
-            throw new InvalidOperationException(Locales.Locales.Audio_DN_InitFailed);
+            throw new InvalidOperationException(Localizer.Get("Audio.DN.InitFailed"));
 
         CleanupDenoiser();
         _denoiser = NoiseSuppressor.Create(audioRecorder.SessionId);
 
         if (_denoiser == null || _denoiser.SetEnabled(true) != AudioEffectStatus.Success)
-            throw new InvalidOperationException(Locales.Locales.Audio_DN_InitFailed);
+            throw new InvalidOperationException(Localizer.Get("Audio.DN.InitFailed"));
     }
 
     public void Denoise(byte[] buffer)
@@ -62,7 +63,7 @@ private void ThrowIfDisposed()
     private void ThrowIfNotInitialized()
     {
         if (_denoiser == null)
-            throw new InvalidOperationException(Locales.Locales.Audio_DN_Init);
+            throw new InvalidOperationException(Localizer.Get("Audio.DN.Init"));
     }
 
     private void Dispose(bool disposing)

VoiceCraft.Client/VoiceCraft.Client.Android/Audio/AudioRecorder.cs

@@ -1,6 +1,7 @@
 using System;
 using Android.Media.Audiofx;
 using VoiceCraft.Core.Interfaces;
+using VoiceCraft.Core.Locales;
 
 namespace VoiceCraft.Client.Android.Audio;
 
@@ -17,13 +18,13 @@ public void
         ThrowIfDisposed();
 
         if (recorder is not AudioRecorder audioRecorder)
-            throw new InvalidOperationException(Locales.Locales.Audio_AEC_InitFailed);
+            throw new InvalidOperationException(Localizer.Get("Audio.AEC.InitFailed"));
 
         CleanupEchoCanceler();
         _echoCanceler = AcousticEchoCanceler.Create(audioRecorder.SessionId);
 
         if (_echoCanceler == null || _echoCanceler.SetEnabled(true) != AudioEffectStatus.Success)
-            throw new InvalidOperationException(Locales.Locales.Audio_AEC_InitFailed);
+            throw new InvalidOperationException(Localizer.Get("Audio.AEC.InitFailed"));
     }
 
     public void EchoPlayback(Span<byte> buffer, int count)
@@ -75,7 +76,7 @@ private void ThrowIfDisposed()
     private void ThrowIfNotInitialized()
     {
         if (_echoCanceler == null)
-            throw new InvalidOperationException(Locales.Locales.Audio_AEC_Init);
+            throw new InvalidOperationException(Localizer.Get("Audio.AEC.Init"));
     }
 
     private void Dispose(bool disposing)

VoiceCraft.Client/VoiceCraft.Client.Android/Audio/NativeAutomaticGainController.cs

@@ -1,6 +1,7 @@
 using System;
 using SpeexDSPSharp.Core;
 using VoiceCraft.Core.Interfaces;
+using VoiceCraft.Core.Locales;
 
 namespace VoiceCraft.Client.Android.Audio;
 
@@ -15,7 +16,7 @@ public void Initialize(IAudioRecorder recorder)
         ThrowIfDisposed();
 
         if (recorder.Channels != 1)
-            throw new InvalidOperationException(Locales.Locales.Audio_AGC_InitFailed);
+            throw new InvalidOperationException(Localizer.Get("Audio.AGC.InitFailed"));
 
         CleanupGainController();
 
@@ -70,7 +71,7 @@ private void ThrowIfDisposed()
     private void ThrowIfNotInitialized()
     {
         if (_gainController == null)
-            throw new InvalidOperationException(Locales.Locales.Audio_AGC_Init);
+            throw new InvalidOperationException(Localizer.Get("Audio.AGC.Init"));
     }
 
     private void Dispose(bool disposing)

VoiceCraft.Client/VoiceCraft.Client.Android/Audio/NativeDenoiser.cs

@@ -1,6 +1,7 @@
 using System;
 using SpeexDSPSharp.Core;
 using VoiceCraft.Core.Interfaces;
+using VoiceCraft.Core.Locales;
 
 namespace VoiceCraft.Client.Android.Audio;
 
@@ -15,7 +16,7 @@ public void Initialize(IAudioRecorder recorder)
         ThrowIfDisposed();
 
         if (recorder.Channels != 1)
-            throw new InvalidOperationException(Locales.Locales.Audio_DN_InitFailed);
+            throw new InvalidOperationException(Localizer.Get("Audio.DN.InitFailed"));
 
         CleanupDenoiser();
 
@@ -68,7 +69,7 @@ private void ThrowIfDisposed()
     private void ThrowIfNotInitialized()
     {
         if (_denoiser == null)
-            throw new InvalidOperationException(Locales.Locales.Audio_DN_Init);
+            throw new InvalidOperationException(Localizer.Get("Audio.DN.Init"));
     }
 
     private void Dispose(bool disposing)