Skip to content

Commit 17eba87

Browse files
SineVector241SineVector241
authored
Merge pull request #191 from AvionBlock/dev
v1.3.0 Release.
2 parents c2e80a6 + ee122c0 commit 17eba87

File tree

127 files changed

+3373
-869
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+3373
-869
lines changed

‎Directory.Packages.props‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
<Project>
2-
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
3-
<PropertyGroup>
4-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5-
<AvaloniaVersion>11.3.9</AvaloniaVersion>
6-
</PropertyGroup>
7-
<ItemGroup>
8-
<!-- Avalonia packages -->
9-
<!-- Important: keep version in sync! -->
10-
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
11-
<PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
12-
<PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
13-
<PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
14-
<PrivateAssets>all</PrivateAssets>
15-
<IncludeAssets>none</IncludeAssets>
16-
</PackageVersion>
17-
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
18-
<PackageVersion Include="Avalonia.iOS" Version="$(AvaloniaVersion)" />
19-
<PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
20-
<PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
21-
<PackageVersion Include="Fleck" Version="1.2.0" />
22-
<PackageVersion Include="LiteNetLib" Version="1.3.5" />
23-
<PackageVersion Include="Message.Avalonia" Version="1.1.0" />
24-
<PackageVersion Include="SharpHook" Version="7.1.0" />
25-
<PackageVersion Include="SpeexDSPSharp" Version="1.2.2" />
26-
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
27-
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
28-
<PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
29-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
30-
<PackageVersion Include="Microsoft.Maui.Essentials" Version="9.0.120" />
31-
<PackageVersion Include="NAudio.WinForms" Version="2.2.1" />
32-
<PackageVersion Include="NAudio.WinMM" Version="2.2.1" />
33-
<PackageVersion Include="OpusSharp" Version="1.6.0" />
34-
<PackageVersion Include="System.Text.Json" Version="10.0.1" />
35-
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
36-
<PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.9.4" />
37-
<PackageVersion Include="Spectre.Console" Version="0.54.0" />
38-
<PackageVersion Include="System.CommandLine" Version="2.0.1" />
39-
</ItemGroup>
2+
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<AvaloniaVersion>11.3.9</AvaloniaVersion>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<!-- Avalonia packages -->
9+
<!-- Important: keep version in sync! -->
10+
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
11+
<PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
12+
<PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)"/>
13+
<PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>none</IncludeAssets>
16+
</PackageVersion>
17+
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
18+
<PackageVersion Include="Avalonia.iOS" Version="$(AvaloniaVersion)"/>
19+
<PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)"/>
20+
<PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersion)"/>
21+
<PackageVersion Include="Fleck" Version="1.2.0"/>
22+
<PackageVersion Include="LiteNetLib" Version="1.3.5"/>
23+
<PackageVersion Include="Message.Avalonia" Version="1.1.0"/>
24+
<PackageVersion Include="SharpHook" Version="7.1.0"/>
25+
<PackageVersion Include="SpeexDSPSharp" Version="1.2.2"/>
26+
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0"/>
27+
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
28+
<PackageVersion Include="DiscordRichPresence" Version="1.6.1.70"/>
29+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1"/>
30+
<PackageVersion Include="Microsoft.Maui.Essentials" Version="9.0.120"/>
31+
<PackageVersion Include="NAudio.WinForms" Version="2.2.1"/>
32+
<PackageVersion Include="NAudio.WinMM" Version="2.2.1"/>
33+
<PackageVersion Include="OpusSharp" Version="1.6.0"/>
34+
<PackageVersion Include="System.Text.Json" Version="10.0.1"/>
35+
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0"/>
36+
<PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.9.4"/>
37+
<PackageVersion Include="Spectre.Console" Version="0.54.0"/>
38+
<PackageVersion Include="System.CommandLine" Version="2.0.1"/>
39+
</ItemGroup>
4040
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public class AudioPlayer : IAudioPlayer
2121
private byte[] _byteBuffer = [];
2222
private int _channels;
2323
private bool _disposed;
24-
private short[] _shortBuffer = [];
2524
private float[] _floatBuffer = [];
2625
private AudioTrack? _nativePlayer;
2726
private Func<byte[], int, int>? _playerCallback;
2827
private int _sampleRate;
28+
private short[] _shortBuffer = [];
2929

3030
public AudioPlayer(AudioManager audioManager, int sampleRate, int channels, Core.AudioFormat format)
3131
{

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public AudioRecorder(AudioManager audioManager, int sampleRate, int channels, Au
3535

3636
public AudioSource AudioSource { get; set; } = AudioSource.VoiceCommunication;
3737

38-
public int SessionId => _nativeRecorder?.AudioSessionId ?? throw new InvalidOperationException(Localizer.Get("Audio.Player.Init"));
38+
public int SessionId => _nativeRecorder?.AudioSessionId ??
39+
throw new InvalidOperationException(Localizer.Get("Audio.Player.Init"));
3940

4041
//Public Properties
4142
public int SampleRate
@@ -44,7 +45,8 @@ public int SampleRate
4445
set
4546
{
4647
if (value < 0)
47-
throw new ArgumentOutOfRangeException(nameof(value), value, "Sample rate must be greater than or equal to zero!");
48+
throw new ArgumentOutOfRangeException(nameof(value), value,
49+
"Sample rate must be greater than or equal to zero!");
4850

4951
_sampleRate = value;
5052
}
@@ -56,7 +58,8 @@ public int Channels
5658
set
5759
{
5860
if (value < 1)
59-
throw new ArgumentOutOfRangeException(nameof(value), value, "Channels must be greater than or equal to one!");
61+
throw new ArgumentOutOfRangeException(nameof(value), value,
62+
"Channels must be greater than or equal to one!");
6063

6164
_channels = value;
6265
}
@@ -84,7 +87,8 @@ public int BufferMilliseconds
8487
set
8588
{
8689
if (value < 0)
87-
throw new ArgumentOutOfRangeException(nameof(value), value, "Buffer milliseconds must be greater than or equal to zero!");
90+
throw new ArgumentOutOfRangeException(nameof(value), value,
91+
"Buffer milliseconds must be greater than or equal to zero!");
8892

8993
_bufferMilliseconds = value;
9094
}

‎VoiceCraft.Client/VoiceCraft.Client.Android/Audio/NativeEchoCanceler.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public class NativeEchoCanceler : IEchoCanceler
1313
public bool IsNative => true;
1414

1515
public void
16-
Initialize(IAudioRecorder recorder, IAudioPlayer player) //We don't need to have the audio player, but it's there for other compatibility reasons.
16+
Initialize(IAudioRecorder recorder,
17+
IAudioPlayer player) //We don't need to have the audio player, but it's there for other compatibility reasons.
1718
{
1819
ThrowIfDisposed();
1920

‎VoiceCraft.Client/VoiceCraft.Client.Android/Audio/SpeexDspAutomaticGainController.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public void Initialize(IAudioRecorder recorder)
2020

2121
CleanupGainController();
2222

23-
_gainController = new SpeexDSPPreprocessor(recorder.BufferMilliseconds * recorder.SampleRate / 1000, recorder.SampleRate);
23+
_gainController = new SpeexDSPPreprocessor(recorder.BufferMilliseconds * recorder.SampleRate / 1000,
24+
recorder.SampleRate);
2425

2526
var @false = 0;
2627
var @true = 1;

‎VoiceCraft.Client/VoiceCraft.Client.Android/Audio/SpeexDspDenoiser.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public void Initialize(IAudioRecorder recorder)
2020

2121
CleanupDenoiser();
2222

23-
_denoiser = new SpeexDSPPreprocessor(recorder.BufferMilliseconds * recorder.SampleRate / 1000, recorder.SampleRate);
23+
_denoiser = new SpeexDSPPreprocessor(recorder.BufferMilliseconds * recorder.SampleRate / 1000,
24+
recorder.SampleRate);
2425

2526
var @false = 0;
2627
var @true = 1;

‎VoiceCraft.Client/VoiceCraft.Client.Android/Audio/SpeexDspEchoCanceler.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ public void Initialize(IAudioRecorder recorder, IAudioPlayer player)
2626

2727
CleanupEchoCanceler();
2828

29-
var bufferSamples = recorder.BufferMilliseconds * recorder.SampleRate / 1000; //Calculate buffer size IN SAMPLES!
29+
var bufferSamples =
30+
recorder.BufferMilliseconds * recorder.SampleRate / 1000; //Calculate buffer size IN SAMPLES!
3031
var bufferBytes = recorder.BitDepth / 8 * recorder.Channels * bufferSamples;
3132
var filterLengthSamples = FilterLengthMs * recorder.SampleRate / 1000;
3233
var filterLengthBytes = player.BitDepth / 8 * player.Channels * filterLengthSamples;
@@ -92,7 +93,7 @@ private byte[] GetCaptureBufferFrame()
9293
Array.Clear(_captureBufferFrame);
9394
if (_captureBuffer.Count < _captureBufferFrame.Length)
9495
return _captureBufferFrame;
95-
96+
9697
_captureBuffer.Read(_captureBufferFrame, 0, _captureBufferFrame.Length);
9798
return _captureBufferFrame;
9899
}

‎VoiceCraft.Client/VoiceCraft.Client.Android/Background/NativeBackgroundService.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ private async Task<bool> StartBackgroundWorker()
8888
"Notifications are required to show running background processes and errors.");
8989

9090
if (await _permissionsService.CheckAndRequestPermission<Permissions.Microphone>(
91-
"Microphone access is required to properly run the background worker.") != PermissionStatus.Granted) return false;
91+
"Microphone access is required to properly run the background worker.") !=
92+
PermissionStatus.Granted) return false;
9293

9394
var context = Application.Context;
9495
var intent = new Intent(context, typeof(AndroidBackgroundService));

‎VoiceCraft.Client/VoiceCraft.Client.Android/NativeHotKeyService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class NativeHotKeyService : HotKeyService
99
public NativeHotKeyService(IEnumerable<HotKeyAction> registeredHotKeyActions) : base(registeredHotKeyActions)
1010
{
1111
}
12-
12+
1313
public override void Initialize()
1414
{
1515
}

‎VoiceCraft.Client/VoiceCraft.Client.Android/NativeStorageService.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ namespace VoiceCraft.Client.Android;
99
public class NativeStorageService : StorageService
1010
{
1111
private static readonly string ApplicationDirectory =
12-
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Constants.ApplicationDirectory);
12+
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
13+
Constants.ApplicationDirectory);
1314

1415
public override bool Exists(string directory)
1516
{

0 commit comments

Comments
 (0)