Skip to content

Commit bb59586

Browse files
Update PyTextToSpeechCommunicator to match recent changes
1 parent 87d9686 commit bb59586

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

src/TrackerCouncil.Smz3.Abstractions/TrackerCouncil.Smz3.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="PySpeechServiceClient" Version="0.0.35" />
15+
<PackageReference Include="PySpeechServiceClient" Version="0.1.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

src/TrackerCouncil.Smz3.Tracking/Services/PyTextToSpeechCommunicator.cs

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ namespace TrackerCouncil.Smz3.Tracking.Services;
1313
internal class PyTextToSpeechCommunicator : ICommunicator
1414
{
1515
private readonly IPySpeechService _pySpeechService;
16+
private (string onnxPath, string jsonPath)? _defaultPrimaryVoice;
17+
private (string onnxPath, string jsonPath)? _defaultAltVoice;
1618
private (string onnxPath, string jsonPath)? _primaryVoice;
1719
private (string onnxPath, string jsonPath)? _altVoice;
1820
private double _rate = 1;
@@ -31,8 +33,8 @@ public PyTextToSpeechCommunicator(IPySpeechService pySpeechService, TrackerOptio
3133
{
3234
var femaleDetails = GetModelPath("Tracker_Female");
3335
var maleDetails = GetModelPath("Tracker_Male");
34-
_primaryVoice = femaleDetails ?? maleDetails;
35-
_altVoice = maleDetails ?? femaleDetails;
36+
_primaryVoice = _defaultPrimaryVoice = femaleDetails ?? maleDetails;
37+
_altVoice = _defaultAltVoice = maleDetails ?? femaleDetails;
3638
}
3739

3840
volume = trackerOptionsAccessor.Options?.TextToSpeechVolume ?? 100;
@@ -81,9 +83,18 @@ public PyTextToSpeechCommunicator(IPySpeechService pySpeechService, TrackerOptio
8183
_isEnabled = trackerOptionsAccessor.Options?.VoiceFrequency != Shared.Enums.TrackerVoiceFrequency.Disabled;
8284
}
8385

84-
public void UseAlternateVoice()
86+
public void UseAlternateVoice(bool useAlt = true)
8587
{
86-
(_primaryVoice, _altVoice) = (_altVoice, _primaryVoice);
88+
if (useAlt)
89+
{
90+
_primaryVoice = _defaultAltVoice;
91+
_altVoice = _defaultPrimaryVoice;
92+
}
93+
else
94+
{
95+
_primaryVoice = _defaultPrimaryVoice;
96+
_altVoice = _defaultAltVoice;
97+
}
8798
}
8899

89100
private async Task Initialize()

src/TrackerCouncil.Smz3.Tracking/TrackerCouncil.Smz3.Tracking.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="BunLabs.Common" Version="1.0.4" />
1111
<PackageReference Include="MattEqualsCoder.MSURandomizer.Library" Version="3.1.1" />
1212
<PackageReference Include="NAudio.Wasapi" Version="2.2.1" />
13-
<PackageReference Include="PySpeechServiceClient" Version="0.0.35" />
13+
<PackageReference Include="PySpeechServiceClient" Version="0.1.0" />
1414
<PackageReference Include="SharpHook" Version="5.3.8" />
1515
<PackageReference Include="System.Speech" Version="9.0.3" />
1616
<PackageReference Include="Websocket.Client" Version="5.1.2" />

src/TrackerCouncil.Smz3.UI/Services/MainWindowService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public async Task StartPySpeechService()
9797
{
9898
return;
9999
}
100-
100+
101101
pySpeechService.AutoReconnect = true;
102102
await pySpeechService.StartAsync();
103103
await pySpeechService.SetSpeechSettingsAsync(new SpeechSettings());
@@ -166,7 +166,7 @@ public async Task DownloadSpritesAsync()
166166
DestinationFolder = RandomizerDirectories.TrackerSpritePath,
167167
HashPath = RandomizerDirectories.TrackerSpriteHashYamlFilePath,
168168
InitialJsonPath = RandomizerDirectories.TrackerSpriteInitialJsonFilePath,
169-
ValidPathCheck = p => p.EndsWith(".png", StringComparison.OrdinalIgnoreCase) || p.EndsWith(".gif", StringComparison.OrdinalIgnoreCase),
169+
ValidPathCheck = p => p.EndsWith(".png", StringComparison.OrdinalIgnoreCase) || p.EndsWith(".gif", StringComparison.OrdinalIgnoreCase) || p.EndsWith(".yml", StringComparison.OrdinalIgnoreCase),
170170
DeleteExtraFiles = RandomizerDirectories.DeleteSprites
171171
};
172172

0 commit comments

Comments
 (0)